diff options
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 69120daa0..9bcb7d326 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -807,9 +807,10 @@ void QQuickWebEngineViewExperimental::findText(const QString &subString, FindFla } } -QQuickWebEngineHistory *QQuickWebEngineViewExperimental::navigationHistory() const +QQuickWebEngineHistory *QQuickWebEngineView::navigationHistory() const { - return d_ptr->m_history.data(); + Q_D(const QQuickWebEngineView); + return d->m_history.data(); } /*! @@ -874,26 +875,19 @@ void QQuickWebEngineViewExperimental::grantFeaturePermission(const QUrl &securit } } -void QQuickWebEngineViewExperimental::goBackTo(int index) +void QQuickWebEngineView::goBackOrForward(int offset) { - if (!d_ptr->adapter) - return; - int count = d_ptr->adapter->currentNavigationEntryIndex(); - if (index < 0 || index >= count) + Q_D(QQuickWebEngineView); + if (!d->adapter) return; + const int current = d->adapter->currentNavigationEntryIndex(); + const int count = d->adapter->navigationEntryCount(); + const int index = current + offset; - d_ptr->adapter->navigateToIndex(count - 1 - index); -} - -void QQuickWebEngineViewExperimental::goForwardTo(int index) -{ - if (!d_ptr->adapter) - return; - int count = d_ptr->adapter->navigationEntryCount() - d_ptr->adapter->currentNavigationEntryIndex() - 1; if (index < 0 || index >= count) return; - d_ptr->adapter->navigateToIndex(d_ptr->adapter->currentNavigationEntryIndex() + 1 + index); + d->adapter->navigateToIndex(index); } void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) |