From 7a60ba9bd32a8b326ca1ae3edddc087218362d3e Mon Sep 17 00:00:00 2001 From: haanhvu Date: Sat, 8 Feb 2025 18:55:41 +0700 Subject: [PATCH] Correct some logics --- .../com/igalia/wolvic/ui/widgets/NavigationBarWidget.java | 3 ++- .../shared/com/igalia/wolvic/ui/widgets/WindowWidget.java | 5 ----- .../common/shared/com/igalia/wolvic/ui/widgets/Windows.java | 5 +++-- 3 files changed, 5 insertions(+), 8 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 index 1651012472..0cfa320751 100644 --- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java +++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java @@ -369,7 +369,8 @@ private void updateUI() { } if (mAttachedWindow.getKeepFullscreenInHamburgerMenu()) { postDelayed(() -> { - mAttachedWindow.keepFullscreenInHamburgerMenu(); + mAttachedWindow.setIsFullScreen(true); + mAttachedWindow.setKeepFullscreenInHamburgerMenu(false); }, 2000); } if (mAudio != null) { 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 index 23f7e4e31c..756317d532 100644 --- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java +++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java @@ -971,11 +971,6 @@ public void setFullscreenInHamburgerMenu() { setFullscreenInHamburgerMenuEnabled(true); } - public void keepFullscreenInHamburgerMenu() { - setIsFullScreen(true); - setKeepFullscreenInHamburgerMenu(false); - } - public void setIsFullScreen(boolean isFullScreen) { if (isFullScreen && fullscreenInHamburgerMenuEnabled) { keepFullscreenInHamburgerMenu = true; diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java index ad635a80b6..705683802f 100644 --- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java +++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java @@ -1771,9 +1771,10 @@ public void showTabAddedNotification() { } } - if (mFocusedWindow.getKeepFullscreenInHamburgerMenu()) { + if (mFocusedWindow.getFullscreenInHamburgerMenuEnabled()) { mFocusedWindow.postDelayed(() -> { - mFocusedWindow.keepFullscreenInHamburgerMenu(); + mFocusedWindow.setIsFullScreen(true); + mFocusedWindow.setKeepFullscreenInHamburgerMenu(false); }, 2000); } }