updated binaries.

gree · Jun 1, 2022 · 21c4efc · 21c4efc
1 parent 51967d4
commit 21c4efc
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 8 deletions.
diff --git a/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView b/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
diff --git a/dist/package-nofragment/Assets/Plugins/WebViewObject.cs b/dist/package-nofragment/Assets/Plugins/WebViewObject.cs
@@ -144,12 +144,12 @@ void Update()
     /// Called from Java native plugin to set when the keyboard is opened
     public void SetKeyboardVisible(string pIsVisible)
     {
-        bool isKeyboardVisible0 = mIsKeyboardVisible;
-        mIsKeyboardVisible = (pIsVisible == "true");
-        if (!Screen.fullScreen)
+        if (BottomAdjustmentDisabled())
         {
             return;
         }
+        bool isKeyboardVisible0 = mIsKeyboardVisible;
+        mIsKeyboardVisible = (pIsVisible == "true");
         if (mIsKeyboardVisible != isKeyboardVisible0 || mIsKeyboardVisible)
         {
             SetMargins(mMarginLeft, mMarginTop, mMarginRight, mMarginBottom, mMarginRelative);
@@ -158,7 +158,11 @@ public void SetKeyboardVisible(string pIsVisible)
 
     public int AdjustBottomMargin(int bottom)
     {
-        if (!mIsKeyboardVisible || !Screen.fullScreen)
+        if (BottomAdjustmentDisabled())
+        {
+            return bottom;
+        }
+        else if (!mIsKeyboardVisible)
         {
             return bottom;
         }
@@ -177,6 +181,14 @@ public int AdjustBottomMargin(int bottom)
             return (bottom > keyboardHeight) ? bottom : keyboardHeight;
         }
     }
+
+    private bool BottomAdjustmentDisabled()
+    {
+        return
+            !Screen.fullScreen
+            || ((Screen.autorotateToLandscapeLeft || Screen.autorotateToLandscapeRight)
+                && (Screen.autorotateToPortrait || Screen.autorotateToPortraitUpsideDown));
+    }
 #else
     IntPtr webView;
 #endif

diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
diff --git a/dist/package/Assets/Plugins/WebViewObject.cs b/dist/package/Assets/Plugins/WebViewObject.cs
@@ -144,12 +144,12 @@ void Update()
     /// Called from Java native plugin to set when the keyboard is opened
     public void SetKeyboardVisible(string pIsVisible)
     {
-        bool isKeyboardVisible0 = mIsKeyboardVisible;
-        mIsKeyboardVisible = (pIsVisible == "true");
-        if (!Screen.fullScreen)
+        if (BottomAdjustmentDisabled())
         {
             return;
         }
+        bool isKeyboardVisible0 = mIsKeyboardVisible;
+        mIsKeyboardVisible = (pIsVisible == "true");
         if (mIsKeyboardVisible != isKeyboardVisible0 || mIsKeyboardVisible)
         {
             SetMargins(mMarginLeft, mMarginTop, mMarginRight, mMarginBottom, mMarginRelative);
@@ -158,7 +158,11 @@ public void SetKeyboardVisible(string pIsVisible)
 
     public int AdjustBottomMargin(int bottom)
     {
-        if (!mIsKeyboardVisible || !Screen.fullScreen)
+        if (BottomAdjustmentDisabled())
+        {
+            return bottom;
+        }
+        else if (!mIsKeyboardVisible)
         {
             return bottom;
         }
@@ -177,6 +181,14 @@ public int AdjustBottomMargin(int bottom)
             return (bottom > keyboardHeight) ? bottom : keyboardHeight;
         }
     }
+
+    private bool BottomAdjustmentDisabled()
+    {
+        return
+            !Screen.fullScreen
+            || ((Screen.autorotateToLandscapeLeft || Screen.autorotateToLandscapeRight)
+                && (Screen.autorotateToPortrait || Screen.autorotateToPortraitUpsideDown));
+    }
 #else
     IntPtr webView;
 #endif

diff --git a/dist/unity-webview-nofragment.unitypackage b/dist/unity-webview-nofragment.unitypackage
diff --git a/dist/unity-webview-nofragment.zip b/dist/unity-webview-nofragment.zip
diff --git a/dist/unity-webview.unitypackage b/dist/unity-webview.unitypackage
diff --git a/dist/unity-webview.zip b/dist/unity-webview.zip