Merge pull request #1346 from pkclsoft/v3.4.9

Added cascadeContentSizeEnabled property

Author: Birkemose

cocos2d/CCNode.h

@@ -212,6 +212,9 @@
 
 	// Opacity/Color propagates into children that conform to if cascadeOpacity/cascadeColor is enabled.
 	BOOL		_cascadeColorEnabled, _cascadeOpacityEnabled;
+    
+    // contentSize changes don't propogate to children unless cascadeContentSize is enabled.
+    BOOL        _cascadeContentSizeEnabled;
 
 @private
 	// Physics Body.
@@ -386,9 +389,12 @@
 /// -----------------------------------------------------------------------
 
 /** The untransformed size of the node in the unit specified by contentSizeType property.
- The contentSize remains the same regardless of whether the node is scaled or rotated.
+ The contentSize remains the same regardless of whether the node is scaled or rotated.  Changes to contentSize will not affect
+ children unless the property cascadeContentSize is enabled.
  @see contentSizeInPoints
- @see contentSizeType */
+ @see contentSizeType
+ @see cascadeContentSizeEnabled
+ */
 @property (nonatomic,readwrite,assign) CGSize contentSize;
 
 /** The untransformed size of the node in Points. The contentSize remains the same regardless of whether the node is scaled or rotated.
@@ -404,6 +410,12 @@
  @see contentSizeInPoints */
 @property (nonatomic,readwrite,assign) CCSizeType contentSizeType;
 
+/**
+ cascadeContentSizeEnabled causes changes to this node's contentSize to cascade down to it's children.
+ @see contentSize
+ */
+@property (nonatomic, getter = isCascadeContentSizeEnabled) BOOL cascadeContentSizeEnabled;
+
 /**
  * Invoked automatically when the OS view has been resized.
  *

cocos2d/CCNode.m

@@ -187,6 +187,7 @@ -(id) init
 		_displayColor = _color = [CCColor whiteColor].ccColor4f;
 		_cascadeOpacityEnabled = NO;
 		_cascadeColorEnabled = NO;
+        _cascadeContentSizeEnabled = NO;
 	}
 
 	return self;
@@ -399,12 +400,11 @@ - (void) contentSizeChanged
     {
         [child parentsContentSizeChanged];
     }
-    
 }
 
 - (void) parentsContentSizeChanged
         {
-    if (!CCSizeTypeIsBasicPoints(_contentSizeType))
+    if (!CCSizeTypeIsBasicPoints(_contentSizeType) && (_cascadeContentSizeEnabled == YES))
     {
         [self contentSizeChanged];
         }
@@ -1679,6 +1679,7 @@ - (BOOL)hitTestWithWorldPos:(CGPoint)pos
 
 @synthesize cascadeColorEnabled=_cascadeColorEnabled;
 @synthesize cascadeOpacityEnabled=_cascadeOpacityEnabled;
+@synthesize cascadeContentSizeEnabled=_cascadeContentSizeEnabled;
 
 -(CGFloat) opacity
 {