Update PR #1107 to fit the UI revamp

b92ea92 Signed-off-by: Songlin Jiang <[email protected]>
Igalia · Nov 21, 2023 · bbaf069 · bbaf069
1 parent 0b0251b
commit bbaf069
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java b/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java
@@ -1099,7 +1099,7 @@ void handleMotionEvent(final int aHandle, final int aDevice, final boolean aFocu
             // We shouldn't divide the scale factor when we pass the motion event to the web engine
             if (widget instanceof WindowWidget) {
                 WindowWidget windowWidget = (WindowWidget) widget;
-                if (!windowWidget.isLibraryVisible()) {
+                if (windowWidget.isInWebPage()) {
                     scale = 1.0f;
                 }
             }

diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
@@ -523,6 +523,10 @@ public boolean isAddonsVisible() {
         return mViewModel.getIsAddonsVisible().getValue().get();
     }
 
+    public boolean isInWebPage() {
+        return !(isLibraryVisible() || isDownloadsVisible() || isWebAppsVisible() || isAddonsVisible() || isCurrentUriBlank());
+    }
+
     public int getWindowWidth() {
         return mWidgetPlacement.width;
     }