[TIMOB-19808] iOS Autolayout - Fixed infinite layout loop

iphone/Classes/Layout/TiLayoutView.m

@@ -636,7 +636,8 @@ -(void)updateWidthAndHeight
     {
         if ([superview isKindOfClass:[UITableView class]]) {
             return;
-        } else if ([superview isKindOfClass:[UIScrollView class]])
+        }
+        else if ([superview isKindOfClass:[UIScrollView class]])
         {
             TiLayoutRemoveChildConstraints(superview, self);
             [superview addConstraints: TI_CONSTR(@"V:|[self]|", viewsDict)];
@@ -766,12 +767,12 @@ -(void)updateMarginsForAbsoluteLayout:(TiLayoutView*)child
     CGFloat bottomValue = TiDimensionCalculateValue(bottom, 1);
 
     // ========= TI.UI.SIZE ============
-    if (IS_AUTOSIZE(_tiLayoutConstraint.width)) {
+    if (IS_AUTOSIZE(_tiLayoutConstraint.width) || (IS_UNDEFINED(_tiLayoutConstraint.width) && IS_AUTOSIZE(_defaultWidth))) {
         [self addConstraints: TI_CONSTR( TI_STRING(@"H:|-(>=%f)-[child]-(>=%f)-|", leftValue, rightValue), viewsDict)];
     } else if (_tiLayoutConstraint.width_isSet) {
         [self removeConstraints: TI_CONSTR( TI_STRING(@"H:|-(>=%f)-[child]-(>=%f)-|", leftValue, rightValue), viewsDict)];
     }
-    if (IS_AUTOSIZE(_tiLayoutConstraint.height)) {
+    if (IS_AUTOSIZE(_tiLayoutConstraint.height) || (IS_UNDEFINED(_tiLayoutConstraint.height) && IS_AUTOSIZE(_defaultHeight))) {
         [self addConstraints: TI_CONSTR( TI_STRING(@"V:|-(>=%f)-[child]-(>=%f)-|", topValue, bottomValue), viewsDict)];
     } else if (_tiLayoutConstraint.height_isSet) {
         [self removeConstraints: TI_CONSTR( TI_STRING(@"V:|-(>=%f)-[child]-(>=%f)-|", topValue, bottomValue), viewsDict)];

iphone/Classes/TiUILabel.m

@@ -149,13 +149,15 @@ -(void)padLabel
 #endif
 }
 
+#ifndef TI_USE_AUTOLAYOUT
 // FIXME: This isn't quite true.  But the brilliant soluton wasn't so brilliant, because it screwed with layout in unpredictable ways.
 //	Sadly, there was a brilliant solution for fixing the blurring here, but it turns out there's a
 //	quicker fix: Make sure the label itself has an even height and width. Everything else is irrelevant.
 -(void)setCenter:(CGPoint)newCenter
 {
 	[super setCenter:CGPointMake(floorf(newCenter.x), floorf(newCenter.y))];
 }
+#endif
 
 -(void)frameSizeChanged:(CGRect)frame bounds:(CGRect)bounds
 {

iphone/layout/Classes/TiLabel.h

@@ -9,5 +9,5 @@
 
 @interface TiLabel : TiLayoutView
 
--(void)setText:(NSString*) text;
+@property (nonatomic, retain) NSString* text;
 @end

iphone/layout/Classes/TiLabel.m

@@ -32,6 +32,7 @@ - (instancetype)init
 
 -(void)setText:(NSString*) text
 {
+    _text = text;
     [label setText:text];
 }
 

iphone/layout/Classes/TiScrollView.m

@@ -32,13 +32,13 @@ - (instancetype)init
         [contentView setBackgroundColor:[UIColor greenColor]];
         [contentView setViewName:@"TiScrollView.ContentView"];
 
-        [contentView setDefaultHeight:TiDimensionFromObject(@"SIZE")];
-        [contentView setDefaultWidth:TiDimensionFromObject(@"SIZE")];
+        [contentView setDefaultHeight:TiDimensionAutoSize];
+        [contentView setDefaultWidth:TiDimensionAutoSize];
 
         [scrollView addSubview:contentView];
 
-        [self setDefaultHeight:TiDimensionFromObject(@"FILL")];
-        [self setDefaultWidth:TiDimensionFromObject(@"FILL")];
+        [self setDefaultHeight:TiDimensionAutoFill];
+        [self setDefaultWidth:TiDimensionAutoFill];
 
         [super addSubview:scrollView];
 

iphone/layout/layout.xcodeproj/project.pbxproj

@@ -370,7 +370,7 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREFIX_HEADER = /Users/penrique/Desktop/layout/layout/layout.pch;
+				GCC_PREFIX_HEADER = $SRCROOT/layout/layout.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -414,7 +414,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = /Users/penrique/Desktop/layout/layout/layout.pch;
+				GCC_PREFIX_HEADER = $SRCROOT/layout/layout.pch;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -461,6 +461,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				GCC_PREFIX_HEADER = $SRCROOT/layout/layout.pch;
 				INFOPLIST_FILE = layoutTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.pec1985.layoutTests;
@@ -473,6 +474,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				GCC_PREFIX_HEADER = $SRCROOT/layout/layout.pch;
 				INFOPLIST_FILE = layoutTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.pec1985.layoutTests;

iphone/layout/layout/ViewController.m

@@ -53,36 +53,67 @@ -(UIColor*) randomColor
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    TiLayoutView* myView = [[TiLayoutView alloc] init];
-    [[self view] addSubview:myView];
-
-    TiScrollableView* scrollable = [[TiScrollableView alloc] init];
-    [scrollable setViewName:@"scrollable"];
-    [scrollable setBackgroundColor:[UIColor grayColor]];
-    [scrollable setHeight_:@"SIZE"];
 
-    NSNumber* bigger = @300;
-    NSNumber* top = @10;
-    NSNumber* bottom = @5;
-    for (int i = 0; i < 5; i++) {
-        TiLayoutView* view = [[TiLayoutView alloc] init];
-        [view setBackgroundColor:[UIColor blueColor]];
-        if (i == 2) {
-            [view setHeight_:bigger];
-            [view setTop_:top];
-            [view setBottom_:bottom];
-        } else {
-            [view setHeight_:@200];
-        }
-        [view setWidth_:@200];
-        [scrollable addSubview:view];
-    }
+    TiLayoutView* window = [[TiLayoutView alloc] init];
 
-    [myView addSubview:scrollable];
 
-    [scrollable setOnLayout:^(TiLayoutView *sender, CGRect rect) {
+    {
+        TiScrollView* scrollView = [[TiScrollView alloc] init];
+        scrollView.top = @10;
+        scrollView.left = @10;
+        scrollView.width = @100;
+        scrollView.height = @150;
+        scrollView.backgroundColor = [UIColor greenColor];
+
+        TiLayoutView* view = [[TiLayoutView alloc] init];
+        view.width = @150;
+        view.height = @200;
+        view.top = @10;
+        view.backgroundColor = [UIColor grayColor];
 
-    }];
+        TiLabel* label = [[TiLabel alloc] init];
+        label.width = @"SIZE";
+        label.height = @"SIZE";
+        label.text = @"Bounce:true, vertbar:false";
+        label.backgroundColor = [UIColor yellowColor];
+
+
+
+        [view addSubview:label];
+        [scrollView addSubview:view];
+
+        [window addSubview:scrollView];
+    }
+
+    {
+        TiScrollView* scrollView = [[TiScrollView alloc] init];
+        scrollView.top = @10;
+        scrollView.right = @10;
+        scrollView.width = @100;
+        scrollView.height = @150;
+        scrollView.backgroundColor = [UIColor greenColor];
+
+        TiLayoutView* view = [[TiLayoutView alloc] init];
+        view.width = @150;
+        view.height = @200;
+        view.top = @10;
+        view.backgroundColor = [UIColor grayColor];
+
+        TiLabel* label = [[TiLabel alloc] init];
+        label.text = @"Bounce:true, horzbar:false";
+        label.width = @"SIZE";
+        label.height = @"SIZE";
+        label.backgroundColor = [UIColor yellowColor];
+
+
+
+        [view addSubview:label];
+        [scrollView addSubview:view];
+
+        [window addSubview:scrollView];
+    }
+
+    [[self view] addSubview:window];
 
 }
 @end