Stop having findInPage and Panel opened at same time

Extend the commit a23e2cf here Signed-off-by: Songlin Jiang <[email protected]>
Igalia · Oct 23, 2023 · 28660eb · 28660eb
1 parent e35dd33
commit 28660eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/viewmodel/WindowViewModel.java b/app/src/common/shared/com/igalia/wolvic/ui/viewmodel/WindowViewModel.java
@@ -698,7 +698,7 @@ public MutableLiveData<ObservableBoolean> getIsFindInPage() {
     }
 
     public void setIsFindInPage(boolean isFindInPage) {
-        this.isFindInPage.postValue(new ObservableBoolean(isFindInPage));
+        this.isFindInPage.setValue(new ObservableBoolean(isFindInPage));
     }
 
     @NonNull

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
@@ -1327,7 +1327,7 @@ public void onSendTab() {
             @Override
             public void onFindInPage() {
                 hideMenu();
-                mAttachedWindow.hidePanel();
+                mAttachedWindow.hideAllPanel();
 
                 mViewModel.setIsFindInPage(true);
             }

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
@@ -537,6 +537,10 @@ int getSelectedPanel() {
         return mLibrary.getSelectedPanelType();
     }
 
+    public void hideAllPanel() {
+        hideAllPanel(true);
+    }
+
     private void hideAllPanel(boolean switchSurface) {
         if (mViewModel.getIsLibraryVisible().getValue().get()) {
             hidePanel(switchSurface);
@@ -663,6 +667,7 @@ private void showDownloadsPanel(boolean switchSurface) {
             if (mView == null) {
                 setView(mDownloads, switchSurface);
                 mDownloads.onShow();
+                mViewModel.setIsFindInPage(false);
                 mViewModel.setIsDownloadsVisible(true);
                 showPanelCommonAction();
 
@@ -694,6 +699,7 @@ private void showWebAppsPanel(boolean switchSurface) {
             if (mView == null) {
                 setView(mWebApps, switchSurface);
                 mWebApps.onShow();
+                mViewModel.setIsFindInPage(false);
                 mViewModel.setIsWebAppsVisible(true);
                 showPanelCommonAction();
 
@@ -725,6 +731,7 @@ private void showAddonsPanel(boolean switchSurface) {
             if (mView == null) {
                 setView(mAddons, switchSurface);
                 mAddons.onShow();
+                mViewModel.setIsFindInPage(false);
                 mViewModel.setIsAddonsVisible(true);
                 showPanelCommonAction();