Clean up

haanhvu · Dec 5, 2024 · 8e0b329 · 8e0b329
1 parent 6d29be0
commit 8e0b329
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 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
@@ -244,8 +244,7 @@ private void updateUI() {
             if (getSession().canGoBack()) {
                 getSession().goBack();
             } else if (mViewModel.getBackToNewTabEnabled().getValue().get()) {
-                //mAttachedWindow.showNewTab();
-                getSession().loadUri("about://newtab");
+                getSession().loadUri(UrlUtils.ABOUT_NEWTAB);
             }
 
             if (mAudio != null) {
@@ -257,8 +256,6 @@ private void updateUI() {
         mBinding.navigationBarNavigation.forwardButton.setOnClickListener(v -> {
             v.requestFocusFromTouch();
             if (mViewModel.getCanGoForwardFromNewTab().getValue().get()) {
-                //mAttachedWindow.hideNewTab();
-
                 String forwardUrl = mViewModel.getUrlForwardFromNewTab().getValue().toString();
                 getSession().loadUri(forwardUrl);
 
@@ -273,7 +270,7 @@ private void updateUI() {
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
-            //mNavigationListeners.forEach(NavigationListener::onForward);
+            mNavigationListeners.forEach(NavigationListener::onForward);
         });
 
         mBinding.navigationBarNavigation.reloadButton.setOnClickListener(v -> {
@@ -1036,7 +1033,10 @@ public void onLocationChange(@NonNull WSession session, @Nullable String url) {
             updateTrackingProtection();
         }
 
-        mBinding.navigationBarNavigation.reloadButton.setEnabled(mViewModel.getCurrentContentType().getValue() != Windows.ContentType.NEW_TAB && !UrlUtils.isPrivateAboutPage(getContext(), url));
+        mBinding.navigationBarNavigation.reloadButton.setEnabled(
+                mViewModel.getCurrentContentType().getValue() != Windows.ContentType.NEW_TAB
+                        && !mViewModel.getIsNativeContentVisible().getValue().get()
+                        && !UrlUtils.isPrivateAboutPage(getContext(), url));
     }
 
     // Content delegate

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
@@ -120,11 +120,9 @@ public void load(@NonNull WindowWidget aWindow, WindowsState aState, int aTabInd
             worldWidth = widgetPlacement.worldWidth;
             tabIndex = aTabIndex;
             if (aWindow.isNativeContentVisible()) {
-                if (aWindow.getCurrentContentType() == ContentType.NEW_TAB) {
-                    contentType = ContentType.NEW_TAB;
-                } else {
-                    contentType = aWindow.getSelectedPanel();
-                }
+                contentType = aWindow.getSelectedPanel();
+            } else if (aWindow.getCurrentContentType() == ContentType.NEW_TAB) {
+                contentType = ContentType.NEW_TAB;
             } else {
                 contentType = ContentType.WEB_CONTENT;
             }