From 1503214b38026c839ce2a92eeceed27921344839 Mon Sep 17 00:00:00 2001
From: wangmchn <wangmchn@163.com>
Date: Sun, 16 Jul 2017 03:38:34 +0800
Subject: [PATCH] [BUGFIX] Fix #286.

Layout stragety adjust.
[BEFORE] Return if height not changed.
[NOW] Layout everytime when viewDidLayoutSubviews called.

Signed-off-by: wangmchn <wangmchn@163.com>
---
 WMPageController/WMPageController.m | 37 +++++++----------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/WMPageController/WMPageController.m b/WMPageController/WMPageController.m
index fbe2962..7f36e62 100755
--- a/WMPageController/WMPageController.m
+++ b/WMPageController/WMPageController.m
@@ -14,9 +14,9 @@
 static NSInteger const kWMUndefinedIndex = -1;
 static NSInteger const kWMControllerCountUndefined = -1;
 @interface WMPageController () {
-    CGFloat _targetX, _superviewHeight;
+    CGFloat _targetX;
     CGRect  _contentViewFrame, _menuViewFrame;
-    BOOL    _hasInited, _shouldNotScroll, _isTabBarHidden;
+    BOOL    _hasInited, _shouldNotScroll;
     NSInteger _initializedIndex, _controllerCount, _markedSelectIndex;
 }
 @property (nonatomic, strong, readwrite) UIViewController *currentViewController;
@@ -85,19 +85,13 @@ - (instancetype)init {
     return self;
 }
 
-- (void)setEdgesForExtendedLayout:(UIRectEdge)edgesForExtendedLayout {
-    if (self.edgesForExtendedLayout == edgesForExtendedLayout) return;
-    [super setEdgesForExtendedLayout:edgesForExtendedLayout];
-    
-    if (_hasInited) {
-        _hasInited = NO;
-        [self viewDidLayoutSubviews];
-    }
-}
-
 - (void)forceLayoutSubviews {
-    _hasInited = NO;
-    [self viewDidLayoutSubviews];
+    if (!self.childControllersCount) return;
+    // 计算宽高及子控制器的视图frame
+    [self wm_calculateSize];
+    [self wm_adjustScrollViewFrame];
+    [self wm_adjustMenuViewFrame];
+    [self wm_adjustDisplayingViewControllersFrame];
 }
 
 - (void)setScrollEnable:(BOOL)scrollEnable {
@@ -696,21 +690,8 @@ - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
     
     if (!self.childControllersCount) return;
-    
-    CGFloat oldSuperviewHeight = _superviewHeight;
-    _superviewHeight = self.view.frame.size.height;
-    BOOL oldTabBarIsHidden = _isTabBarHidden;
-    _isTabBarHidden = [self wm_bottomView].hidden;
-    
-    BOOL shouldNotLayout = (_hasInited && _superviewHeight == oldSuperviewHeight && _isTabBarHidden == oldTabBarIsHidden);
-    if (shouldNotLayout) return;
-    // 计算宽高及子控制器的视图frame
-    [self wm_calculateSize];
-    [self wm_adjustScrollViewFrame];
-    [self wm_adjustMenuViewFrame];
-    [self wm_adjustDisplayingViewControllersFrame];
+    [self forceLayoutSubviews];
     _hasInited = YES;
-    [self.view layoutIfNeeded];
     [self wm_delaySelectIndexIfNeeded];
 }