Keep page's zoom level on loading new urls

Ammends d236c5a8a3. Zoom level was set as a temporal one, which is
invalidated each time when a renderer process or widget are changed
(on new navigation, for example), so it needs to be reapplied.

Fixes: QTBUG-101030
Change-Id: Iecff9686fbe2b79e99b46f67cab92f66127be085
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 1e27d42a8071532b6cc30a9bcc5f700edc56952a)

1 files changed, 12 insertions, 6 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 7164a1c50..50e0711af 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -434,6 +434,12 @@ void QQuickWebEngineViewPrivate::selectionChanged()
     updateEditActions();
 }
 
+void QQuickWebEngineViewPrivate::zoomUpdateIsNeeded()
+{
+    Q_Q(QQuickWebEngineView);
+    q->setZoomFactor(m_zoomFactor);
+}
+
 void QQuickWebEngineViewPrivate::recentlyAudibleChanged(bool recentlyAudible)
 {
     Q_Q(QQuickWebEngineView);
@@ -908,10 +914,8 @@ void QQuickWebEngineViewPrivate::initializationFinished()
         emit q->backgroundColorChanged();
     }
 
-    if (!qFuzzyCompare(adapter->currentZoomFactor(), m_zoomFactor)) {
-        adapter->setZoomFactor(m_zoomFactor);
-        emit q->zoomFactorChanged(m_zoomFactor);
-    }
+    // apply if it was set before first ever navigation already
+    q->setZoomFactor(m_zoomFactor);
 
 #if QT_CONFIG(webengine_webchannel)
     if (m_webChannel)
@@ -1149,9 +1153,11 @@ void QQuickWebEngineView::stop()
 void QQuickWebEngineView::setZoomFactor(qreal arg)
 {
     Q_D(QQuickWebEngineView);
-    if (d->adapter->isInitialized() &&  !qFuzzyCompare(d->m_zoomFactor, d->adapter->currentZoomFactor())) {
+    if (d->adapter->isInitialized() && !qFuzzyCompare(arg, zoomFactor())) {
         d->adapter->setZoomFactor(arg);
-        emit zoomFactorChanged(arg);
+        // MEMO: should reset if factor was not applied due to being invalid
+        d->m_zoomFactor = zoomFactor();
+        emit zoomFactorChanged(d->m_zoomFactor);
     } else {
         d->m_zoomFactor = arg;
     }