Utilize the new zoomFactorChanged signal. https://redmine.stoutner.com/issues/845

diff --git a/src/widgets/TabWidget.cpp b/src/widgets/TabWidget.cpp
index 4f89cb3c8be9d4fabc204f5d968a1dc01178f31d..e68180d2cf6277d9a3a334593228b9c35fbc2534 100644 (file)
--- a/src/widgets/TabWidget.cpp
+++ b/src/widgets/TabWidget.cpp
@@ -380,12 +380,12 @@ PrivacyWebEngineView* TabWidget::addTab(const bool removeUrlLineEditFocus, const
         }
     });
 
-    // Update the zoom actions when changed by CTRL-Scrolling.  This can be modified when <https://redmine.stoutner.com/issues/845> is fixed.
-    connect(webEnginePagePointer, &QWebEnginePage::contentsSizeChanged, [webEnginePagePointer, this] ()
+    // Update the zoom actions when they are changed.
+    connect(webEnginePagePointer, &QWebEnginePage::zoomFactorChanged, [webEnginePagePointer, this] (const qreal newZoomFactor)
     {
         // Only update the zoom actions if this is the current tab.
         if (webEnginePagePointer == currentWebEnginePagePointer)
-            Q_EMIT updateZoomActions(webEnginePagePointer->zoomFactor());
+            Q_EMIT updateZoomActions(newZoomFactor);
     });
 
     // Display find text results.

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index 597bd8b05960392b57212c9b99532f95d363e2ea..c92c61390beb3340c235348659f602df39e47061 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * SPDX-FileCopyrightText: 2022-2024 Soren Stoutner <soren@stoutner.com>
+ * SPDX-FileCopyrightText: 2022-2025 Soren Stoutner <soren@stoutner.com>
  *
  * This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc/>.
  *
@@ -967,9 +967,6 @@ void BrowserWindow::decrementZoom()
 
     // Set the new zoom factor.
     tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactorDouble);
-
-    // Update the on-the-fly action text.
-    updateZoomActions(currentZoomFactorDouble);
 }
 
 void BrowserWindow::editBookmarks()
@@ -1103,9 +1100,6 @@ void BrowserWindow::getZoomFactorFromUser()
     {
         // Set the new zoom factor.
         tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactorDouble);
-
-        // Update the on-the-fly action text.
-        updateZoomActions(newZoomFactorDouble);
     }
 }
 
@@ -1154,9 +1148,6 @@ void BrowserWindow::incrementZoom()
 
     // Set the new zoom factor.
     tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactorDouble);
-
-    // Update the on-the-fly action text.
-    updateZoomActions(currentZoomFactorDouble);
 }
 
 void BrowserWindow::loadUrlFromLineEdit(const QString &url) const
@@ -2317,7 +2308,4 @@ void BrowserWindow::zoomDefault()
 {
     // Set the new zoom factor.
     tabWidgetPointer->applyOnTheFlyZoomFactor(defaultZoomFactorDouble);
-
-    // Update the on-the-fly action text.
-    updateZoomActions(defaultZoomFactorDouble);
 }