From d69e0bb0d2fade75c31e57047c03746d694a6113 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@digia.com>
Date: Fri, 3 Oct 2014 17:02:43 +0200
Subject: Implement programatic zooming for QtQuick

and add shortcuts in the examples (with a basic UI in the test browser)

Change-Id: I237a04cf0b1fce2e0c6f8a19891ff3cb51727a40
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
 tests/quicktestbrowser/ZoomController.qml | 102 ++++++++++++++++++++++++++++++
 tests/quicktestbrowser/quickwindow.qml    |  24 +++++++
 tests/quicktestbrowser/resources.qrc      |   1 +
 3 files changed, 127 insertions(+)
 create mode 100644 tests/quicktestbrowser/ZoomController.qml

(limited to 'tests')

diff --git a/tests/quicktestbrowser/ZoomController.qml b/tests/quicktestbrowser/ZoomController.qml
new file mode 100644
index 000000000..a714ed2a9
--- /dev/null
+++ b/tests/quicktestbrowser/ZoomController.qml
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Layouts 1.1
+
+Rectangle {
+    property alias zoomFactor: slider.value ;
+    function zoomIn() {
+        visible = true
+        visibilityTimer.restart()
+        zoomFactor = zoomFactor + 0.25;
+    }
+    function zoomOut() {
+        visible = true
+        visibilityTimer.restart()
+        zoomFactor = zoomFactor - 0.25;
+    }
+    function reset() { zoomFactor = 1.0 }
+
+    width: 220
+    height: 30
+    color: palette.window
+    visible: false
+    radius: 4
+
+    SystemPalette {
+        id: palette
+    }
+    Timer {
+        id: visibilityTimer
+        interval: 3000
+        repeat: false
+        onTriggered: zoomController.visible = false
+    }
+
+    RowLayout {
+        anchors.margins: 4
+        anchors.fill: parent
+        ToolButton {
+            id: plusButton
+            text: '+'
+            onClicked: zoomIn()
+        }
+        ToolButton {
+            text: '\u2014'
+            id: minusButton
+            onClicked: zoomOut()
+        }
+        Slider {
+            id: slider
+            maximumValue: 5.0
+            minimumValue: 0.25
+            Layout.fillWidth: true;
+            stepSize: 0.05
+            value: 1
+            onValueChanged: visibilityTimer.restart()
+        }
+        Button {
+            text: "Reset"
+            onClicked: reset()
+        }
+    }
+}
diff --git a/tests/quicktestbrowser/quickwindow.qml b/tests/quicktestbrowser/quickwindow.qml
index f24717b01..ebde5b1ab 100644
--- a/tests/quicktestbrowser/quickwindow.qml
+++ b/tests/quicktestbrowser/quickwindow.qml
@@ -121,6 +121,18 @@ ApplicationWindow {
                 browserWindow.showNormal()
         }
     }
+    Action {
+        shortcut: "Ctrl+0"
+        onTriggered: zoomController.reset()
+    }
+    Action {
+        shortcut: "Ctrl+-"
+        onTriggered: zoomController.zoomOut()
+    }
+    Action {
+        shortcut: "Ctrl+="
+        onTriggered: zoomController.zoomIn()
+    }
 
     Menu {
         id: backHistoryMenu
@@ -391,4 +403,16 @@ ApplicationWindow {
             }
         }
     }
+    ZoomController {
+      id: zoomController
+      y: parent.mapFromItem(currentWebView, 0 , 0).y - 4
+      anchors.right: parent.right
+      width: (parent.width > 800) ? parent.width * 0.25 : 220
+      anchors.rightMargin: (parent.width > 400) ? 100 : 0
+    }
+    Binding {
+        target: currentWebView
+        property: "zoomFactor"
+        value: zoomController.zoomFactor
+    }
 }
diff --git a/tests/quicktestbrowser/resources.qrc b/tests/quicktestbrowser/resources.qrc
index cdc3d2304..4880b3d65 100644
--- a/tests/quicktestbrowser/resources.qrc
+++ b/tests/quicktestbrowser/resources.qrc
@@ -4,6 +4,7 @@
         <file>ContextMenuExtras.qml</file>
         <file>FeaturePermissionBar.qml</file>
         <file>ButtonWithMenu.qml</file>
+        <file>ZoomController.qml</file>
     </qresource>
     <qresource prefix="icons">
         <!-- To the risk of this breaking more often, do not duplicate the resources since this application won't be deployed -->
-- 
cgit v1.2.3