Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-11194] Push parent into layout queue if non absolute layout #3062

Merged
merged 1 commit into from
Sep 27, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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