diff --git a/README.md b/README.md index fa7f958..362381b 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,8 @@ UIColor.defaultShadowImageHidden = true ## Update +- **2020.08.17** +解决问题:解决modal出来一个导航控制然后push到其他Vc,点击返回按钮crash的bug - **2017.12.09** 解决问题:解决导航栏颜色和标题颜色改变失败的bug diff --git a/WRNavigationBar_swift/.DS_Store b/WRNavigationBar_swift/.DS_Store new file mode 100644 index 0000000..da8f635 Binary files /dev/null and b/WRNavigationBar_swift/.DS_Store differ diff --git a/WRNavigationBar_swift/WRNavigationBar_swift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WRNavigationBar_swift/WRNavigationBar_swift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/WRNavigationBar_swift/WRNavigationBar_swift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift b/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift index 5066e10..94b1be8 100644 --- a/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift +++ b/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift @@ -57,7 +57,7 @@ extension UIViewController return wr_currentViewController(from: tabBarController.selectedViewController!) } else if fromVC.presentedViewController != nil { - return wr_currentViewController(from:fromVC.presentingViewController!) + return wr_currentViewController(from:fromVC.presentedViewController!) } else { return fromVC