summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2017-04-28 15:45:22 +0300
committerKari Oikarinen <kari.oikarinen@qt.io>2018-08-28 10:11:43 +0000
commit1810562378787224997a8476a46efa2030a8caef (patch)
tree97e2c7843cf371cba9218493e36a77d8a7f83afd
parentd1d81167b5621ee4bd4d3636c7ffc4df9602a22c (diff)
Move FPS indicator to its own QML file
Change-Id: I34670b95f8fe1bce49042734e168bfff6b3e78b4 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--qml.qrc1
-rw-r--r--qml/FpsIndicator.qml55
-rw-r--r--qml/MainWindow.qml24
3 files changed, 58 insertions, 22 deletions
diff --git a/qml.qrc b/qml.qrc
index 2977620..615bfc0 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -22,5 +22,6 @@
<file>qml/BusyIndicator.qml</file>
<file>qml/MainWindow.qml</file>
<file>qml/FlickSlider.qml</file>
+ <file>qml/FpsIndicator.qml</file>
</qresource>
</RCC>
diff --git a/qml/FpsIndicator.qml b/qml/FpsIndicator.qml
new file mode 100644
index 0000000..b83cb27
--- /dev/null
+++ b/qml/FpsIndicator.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt for Device Creation.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.4
+
+Item {
+ id: fps
+ property bool enabled
+
+ opacity: enabled ? 1 : 0
+ Behavior on opacity { NumberAnimation { duration: 500 } }
+
+ anchors.bottom: parent.bottom;
+ anchors.left: parent.left;
+ width: fpsLabel.width
+ height: fpsLabel.height
+
+ Rectangle {
+ color: "black"
+ opacity: 0.5
+ anchors.fill: fpsLabel
+ }
+
+ Text {
+ id: fpsLabel;
+ color: "white"
+ text: "FPS: " + engine.fps
+ font.pixelSize: engine.sensibleButtonSize() * 0.2
+ }
+}
diff --git a/qml/MainWindow.qml b/qml/MainWindow.qml
index 060b9b5..0249773 100644
--- a/qml/MainWindow.qml
+++ b/qml/MainWindow.qml
@@ -319,28 +319,8 @@ Item {
}
}
- Item {
- id: fps
- opacity: engine.fpsEnabled ? 1 : 0
- Behavior on opacity { NumberAnimation { duration: 500 } }
-
- anchors.bottom: parent.bottom;
- anchors.left: parent.left;
- width: fpsLabel.width
- height: fpsLabel.height
-
- Rectangle {
- color: "black"
- opacity: 0.5
- anchors.fill: fpsLabel
- }
-
- Text {
- id: fpsLabel;
- color: "white"
- text: "FPS: " + engine.fps
- font.pixelSize: engine.sensibleButtonSize() * 0.2
- }
+ FpsIndicator {
+ enabled: engine.fpsEnabled
}
}
}