Skip to content

Commit 3bad6d6

Browse files
committed
fix: rickytan#96 修复从下一级返回上一级时,如果上级没有设置 disable,会自动设置 disable 为 YES 的 bug,因为返回到上一级时,hasSetLeftItem 永远为 YES;
1 parent ccad864 commit 3bad6d6

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.6.2
2+
3+
- fix #96
4+
15
0.6.1
26

37
- fix `-preferredStatusBarStyle`

RTRootNavigationController.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'RTRootNavigationController'
11-
s.version = '0.6.1'
11+
s.version = '0.6.2'
1212
s.summary = 'Transparently make every view controller has its own navigation bar'
1313
s.description = <<-DESC
1414
More and more apps use custom navigation bar for each different view controller, instead of one common, gloabal navigation bar.

RTRootNavigationController/Classes/RTRootNavigationController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,9 @@ - (void)navigationController:(UINavigationController *)navigationController
860860
if (hasSetLeftItem && !viewController.rt_hasSetInteractivePop) {
861861
viewController.rt_disableInteractivePop = YES;
862862
}
863+
else if (!viewController.rt_hasSetInteractivePop) {
864+
viewController.rt_disableInteractivePop = NO;
865+
}
863866
if (!self.useSystemBackBarButtonItem && !hasSetLeftItem) {
864867
if ([viewController respondsToSelector:@selector(rt_customBackItemWithTarget:action:)]) {
865868
viewController.navigationItem.leftBarButtonItem = [viewController rt_customBackItemWithTarget:self

0 commit comments

Comments
 (0)