修复当UINavigationBar的translucent为No时的显示问题。

pcjbird · Jan 5, 2018 · 54fb2f4 · 54fb2f4
1 parent 0f0d6c7
commit 54fb2f4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/QuickWebKit.podspec b/QuickWebKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "QuickWebKit"
-    s.version          = "1.0.4"
+    s.version          = "1.0.5"
     s.summary          = "A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。"
     s.description      = <<-DESC
     A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。

diff --git a/QuickWebKit/QuickWebCore/QuickWebViewController.m b/QuickWebKit/QuickWebCore/QuickWebViewController.m
@@ -439,7 +439,7 @@ -(void)viewDidLayoutSubviews
     top += [_contentWebView.scrollView quickweb_safeAreaInsets].top;
     if (!IsiOS11Later)
     {
-        if(!_navbarTransparent)
+        if(!_navbarTransparent&&self.navigationController.navigationBar.translucent)
         {
             top += StatusBarHeight;
             top += NavigationBarHeight;

diff --git a/QuickWebKit/QuickWebKit.h b/QuickWebKit/QuickWebKit.h
@@ -8,6 +8,9 @@
 //  框架名称:QuickWebKit
 //  框架功能:A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。
 //  修改记录:
+//     pcjbird    2018-01-05  Version:1.0.5 Build:201801050001
+//                            1.修复当UINavigationBar的translucent为No时的显示问题。
+//
 //     pcjbird    2018-01-04  Version:1.0.4 Build:201801040001
 //                            1.新增Spotlight插件
 //

diff --git a/QuickWebKit/QuickWebPlugins/QuickWebProviderPlugin/QuickWebProviderPlugin.m b/QuickWebKit/QuickWebPlugins/QuickWebProviderPlugin/QuickWebProviderPlugin.m
@@ -45,7 +45,7 @@ -(void)webViewControllerDidLayoutSubviews:(QuickWebViewController *)webViewContr
     top += [webViewController.webView.scrollView quickweb_safeAreaInsets].top;
     if (!IsiOS11Later)
     {
-        if(!webViewController.navbarTransparent)
+        if(!webViewController.navbarTransparent && webViewController.navigationController.navigationBar.translucent)
         {
             top += [[UIApplication sharedApplication] statusBarFrame].size.height;
             top += 44.0f;

diff --git a/QuickWebKit/Supporting Files/Info.plist b/QuickWebKit/Supporting Files/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>