Skip to content

Commit

Permalink
Merge pull request #3062 from vishalduggal/timob-11194
Browse files Browse the repository at this point in the history
[TIMOB-11194] Push parent into layout queue if non absolute layout
  • Loading branch information
srahim committed Sep 27, 2012
2 parents 7b96fb0 + 7f6ebd1 commit a5f1920
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions iphone/Classes/TiViewProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,14 @@ -(void)add:(id)arg
[arg parentWillShow];
}

// only call layout if the view is attached
// Maybe need to call layout children instead for non absolute layout
[self layoutChild:arg optimize:NO withMeasuredBounds:[[self size] rect]];
//If layout is non absolute push this into the layout queue
//else just layout the child with current bounds
if (!TiLayoutRuleIsAbsolute(layoutProperties.layoutStyle) ) {
[self contentsWillChange];
}
else {
[self layoutChild:arg optimize:NO withMeasuredBounds:[[self size] rect]];
}
}
else
{
Expand Down

0 comments on commit a5f1920

Please sign in to comment.