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.

Sign up for GitHub

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

Jump to bottom

[TIMOB-15901] (3_2_X) Send parent resize message correctly #5066

Merged
merged 2 commits into from
Dec 5, 2013
Merged

[TIMOB-15901] (3_2_X) Send parent resize message correctly #5066

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c43555a
[TIMOB-15901] Send parent resize message correctly
vishalduggal Dec 5, 2013
76655af
[TIMOB-15901] Always call manageCache when refreshing scollview bounds
vishalduggal Dec 5, 2013
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
18 changes: 7 additions & 11 deletions iphone/Classes/TiUIScrollableView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ -(void)renderViewForIndex:(int)index
[viewproxy windowWillOpen];
[viewproxy windowDidOpen];
[viewproxy layoutChildrenIfNeeded];
} else if (!CGRectEqualToRect([viewproxy sandboxBounds], [wrapper bounds])) {
[viewproxy parentSizeWillChange];
}
}

Expand Down Expand Up @@ -317,19 +319,13 @@ -(void)refreshScrollView:(CGRect)visibleBounds readd:(BOOL)readd
}
}

if (page==0 || readd)
{
[self manageCache:page];
}
[self manageCache:page];

CGRect contentBounds;
contentBounds.origin.x = viewBounds.origin.x;
contentBounds.origin.y = viewBounds.origin.y;
contentBounds.size.width = viewBounds.size.width;
contentBounds.size.height = viewBounds.size.height-(showPageControl ? pageControlHeight : 0);
contentBounds.size.width *= viewsCount;
CGSize contentBounds;
contentBounds.width = viewBounds.size.width*viewsCount;
contentBounds.height = viewBounds.size.height-(showPageControl ? pageControlHeight : 0);

[sv setContentSize:contentBounds.size];
[sv setContentSize:contentBounds];
[sv setFrame:CGRectMake(0, 0, visibleBounds.size.width, visibleBounds.size.height)];
}

Expand Down