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 19908 #7809

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions demos/KitchenSink/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.project
.settings
build
Resources
12 changes: 10 additions & 2 deletions iphone/Classes/TiUIImageView.m
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,11 @@ -(void)timerFired:(id)arg

-(void)queueImage:(id)img index:(NSUInteger)index_
{
UIView *view = [[UIView alloc] initWithFrame:self.bounds];
#ifdef TI_USE_AUTOLAYOUT
UIView *view = [[TiLayoutView alloc] init];
#else
UIView *view = [[UIView alloc] initWithFrame:self.bounds];
#endif
UIActivityIndicatorView *spinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];

spinner.center = view.center;
Expand Down Expand Up @@ -574,7 +578,11 @@ -(UIView*)container
{
// we use a separate container view so we can both have an image
// and a set of images
container = [[UIView alloc] initWithFrame:self.bounds];
#ifdef TI_USE_AUTOLAYOUT
container = [[TiLayoutView alloc] initWithFrame:self.bounds];
#else
container = [[UIView alloc] initWithFrame:self.bounds];
#endif
container.userInteractionEnabled = NO;
[self addSubview:container];
}
Expand Down
1 change: 1 addition & 0 deletions iphone/Classes/TiUIScrollableView.m
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ -(void)layoutSubviews
_constraintAdded = YES;
_scrollView = [self scrollview];
_dotsView = [self pagecontrol];
[super addSubview:_dotsView];
NSDictionary* views = NSDictionaryOfVariableBindings(_contentView, _scrollView, _dotsView);
[_scrollView addConstraints:TI_CONSTR(@"V:|[_contentView(_scrollView)]|", views)];
[_scrollView addConstraints:TI_CONSTR(@"H:|[_contentView(>=_scrollView)]|", views)];
Expand Down