Merge pull request #125 from victor-gabana/App_becomes_unresponsive_BUG

Moved the logic to enable the user interaction of the views outside t…
Merge pull request #135 from OliverPearmain/ISSUE-134-Fix-XLButtonBarView-fontLabel-Property
2016-10-26 10:55:45 -03:00 · 2016-03-23 06:18:56 -03:00 · 2016-02-26 09:44:55 +00:00 · 2016-02-12 16:59:34 +00:00
2 changed files with 12 additions and 8 deletions
--- a/XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m
+++ b/XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m
@ -405,6 +405,10 @@
    
    [buttonBarCell.label setText:[childController titleForPagerTabStripViewController:self]];
    
+    if (self.buttonBarView.labelFont) {
+        buttonBarCell.label.font = self.buttonBarView.labelFont;
+    }
+    
    if ([childController respondsToSelector:@selector(imageForPagerTabStripViewController:)]) {
        UIImage *image = [childController imageForPagerTabStripViewController:self];
        buttonBarCell.imageView.image = image;
--- a/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m
+++ b/XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m
@ -441,18 +441,18 @@
 {
    if (self.containerView == scrollView && _pagerTabStripChildViewControllersForScrolling){
        _pagerTabStripChildViewControllersForScrolling = nil;
-        if (self.navigationController){
-            self.navigationController.view.userInteractionEnabled = YES;
-        }
-        else{
-            self.view.userInteractionEnabled = YES;
-        }
+        
        [self updateContent];
    }
+    
+    if (self.navigationController){
+        self.navigationController.view.userInteractionEnabled = YES;
+    }
+    else{
+        self.view.userInteractionEnabled = YES;
+    }
 }

-
-
 #pragma mark - Orientation

 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
Author	SHA1	Message	Date
Mathias Claassen	d053e5067f	Merge pull request #125 from victor-gabana/App_becomes_unresponsive_BUG Moved the logic to enable the user interaction of the views outside t…	2016-10-26 10:55:45 -03:00
Martin Barreto	bcf0e6daec	Merge pull request #135 from OliverPearmain/ISSUE-134-Fix-XLButtonBarView-fontLabel-Property ISSUE-134 - If the labelFont is set on buttonBarView (XLButtonBarView…	2016-03-23 06:18:56 -03:00
Oliver Pearmain	0674804512	ISSUE-134 - If the labelFont is set on buttonBarView (XLButtonBarView) then it should override the font defined in the XIB.	2016-02-26 09:44:55 +00:00
Victor Gabana	2e46fbb8ea	Moved the logic to enable the user interaction of the views outside the condition in the method scrollViewDidEndScrollingAnimation: This way we make sure the interface never gets disabled forever if the user interacts with the interface like crazy tapping every button fast.	2016-02-12 16:59:34 +00:00