Correct logic for keeping fullscreen mode in hamburger menu

haanhvu · Feb 8, 2025 · 62c7ae9 · 62c7ae9
1 parent 45ae4df
commit 62c7ae9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
@@ -1370,8 +1370,7 @@ public void onResize() {
 
             @Override
             public void onFullScreen() {
-                mAttachedWindow.setIsFullScreen(true);
-                mAttachedWindow.setKeepFullscreenInHamburgerMenu(true);
+                mAttachedWindow.setFullscreenInHamburgerMenu();
             }
 
             @Override

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
@@ -153,6 +153,7 @@ public class WindowWidget extends UIWidget implements SessionChangeListener,
     private SharedPreferences mPrefs;
     private DownloadsManager mDownloadsManager;
     private float mBrowserDensity;
+    private boolean fullscreenInHamburgerMenuEnabled;
     private boolean keepFullscreenInHamburgerMenu;
 
     public interface WindowListener {
@@ -965,7 +966,16 @@ public boolean isResizing() {
         return mIsResizing;
     }
 
+    public void setFullscreenInHamburgerMenu() {
+        setIsFullScreen(true);
+        setFullscreenInHamburgerMenuEnabled(true);
+    }
+
     public void setIsFullScreen(boolean isFullScreen) {
+        if (isFullScreen && fullscreenInHamburgerMenuEnabled) {
+            keepFullscreenInHamburgerMenu = true;
+        }
+
         if (mViewModel.getIsFullscreen().getValue().get() != isFullScreen) {
             mViewModel.setIsFullscreen(isFullScreen);
             for (WindowListener listener: mListeners) {
@@ -2347,6 +2357,14 @@ private float getBrowserDensity() {
         return mBrowserDensity;
     }
 
+    public boolean getFullscreenInHamburgerMenuEnabled() {
+        return fullscreenInHamburgerMenuEnabled;
+    }
+
+    public void setFullscreenInHamburgerMenuEnabled(boolean fullscreenInHamburgerMenuEnabled) {
+        this.fullscreenInHamburgerMenuEnabled = fullscreenInHamburgerMenuEnabled;
+    }
+
     public boolean getKeepFullscreenInHamburgerMenu() {
         return keepFullscreenInHamburgerMenu;
     }