From d236c5a8a34803bda6115956184398b99dbba408 Mon Sep 17 00:00:00 2001 From: Michael Bruning Date: Fri, 15 Apr 2016 17:37:04 +0200 Subject: Use the temporary zoom factor to set the zoom factor It turns out that using the temporary zoom factor is meant to set the zoom factor for one certain view, and this is actually what we want. Also added auto tests for this. Task-number: QTBUG-51851 Task-number: QTBUG-51969 Change-Id: I8912cbc25637d3c1681026380a2ab3068a964868 Reviewed-by: Michal Klocek --- .../qquickwebengineview/tst_qquickwebengineview.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'tests/auto/quick/qquickwebengineview') diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index a1900a77d..60e495137 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -60,6 +60,7 @@ private Q_SLOTS: void inputMethod(); void inputMethodHints(); void basicRenderingSanity(); + void setZoomFactor(); private: inline QQuickWebEngineView *newWebEngineView(); @@ -461,5 +462,24 @@ void tst_QQuickWebEngineView::inputMethodHints() #endif } +void tst_QQuickWebEngineView::setZoomFactor() +{ + QQuickWebEngineView *view = webEngineView(); + + QVERIFY(qFuzzyCompare(view->zoomFactor(), 1.0)); + view->setZoomFactor(2.5); + QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5)); + + view->setUrl(urlFromTestPath("html/basic_page.html")); + QVERIFY(waitForLoadSucceeded(view)); + QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5)); + + view->setZoomFactor(0.1); + QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5)); + + view->setZoomFactor(5.5); + QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5)); +} + QTEST_MAIN(tst_QQuickWebEngineView) #include "tst_qquickwebengineview.moc" -- cgit v1.2.3