TouchInstinct
/
XLPagerTabStrip
314
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
Martin Barreto 2015-12-29 14:15:01 -03:00
parent 9c8ef4053a ad4b564756
commit ba803baecd
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m
View File

@ -228,6 +228,16 @@
[buttonBarCell.label setText:[childController titleForPagerTabStripViewController:self]];
if ([childController respondsToSelector:@selector(imageForPagerTabStripViewController:)]) {
UIImage *image = [childController imageForPagerTabStripViewController:self];
buttonBarCell.imageView.image = image;
}
if ([childController respondsToSelector:@selector(highlightedImageForPagerTabStripViewController:)]) {
UIImage *image = [childController highlightedImageForPagerTabStripViewController:self];
buttonBarCell.imageView.highlightedImage = image;
}
if (self.isProgressiveIndicator) {
if (self.changeCurrentIndexProgressiveBlock) {
self.changeCurrentIndexProgressiveBlock(self.currentIndex == indexPath.item ? nil : cell , self.currentIndex == indexPath.item ? cell : nil, 1, YES, NO);

1
XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.h
View File

@ -40,6 +40,7 @@
@optional
- (UIImage *)imageForPagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController;
- (UIImage *)highlightedImageForPagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController;
- (UIColor *)colorForPagerTabStripViewController:(XLPagerTabStripViewController *)pagerTabStripViewController;
@end