diff options
| -rw-r--r-- | qml.qrc | 1 | ||||
| -rw-r--r-- | qml/DemoInfoPopup.qml | 2 | ||||
| -rw-r--r-- | qml/FpsIndicator.qml | 55 | ||||
| -rw-r--r-- | qml/MainWindow.qml | 28 |
4 files changed, 62 insertions, 24 deletions
@@ -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/DemoInfoPopup.qml b/qml/DemoInfoPopup.qml index 11bc826..c850221 100644 --- a/qml/DemoInfoPopup.qml +++ b/qml/DemoInfoPopup.qml @@ -31,8 +31,6 @@ import QtQuick.Controls 2.2 Rectangle { id: demoInfoPopup - width: parent.width - height: parent.height color: viewSettings.backgroundColor opacity: 0.9 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 2fb898d..0249773 100644 --- a/qml/MainWindow.qml +++ b/qml/MainWindow.qml @@ -33,6 +33,7 @@ import QtDeviceUtilities.SettingsUI 1.0 import com.qtcompany.B2QtLauncher 1.0 Item { + id: mainWindow anchors.fill: parent Component { id: emptyComponent @@ -215,6 +216,9 @@ Item { DemoInfoPopup { id: demoInfoPopup visible: false + height: mainWindow.height + width: mainWindow.width + z: demoHeader.z + 1 } /* Handwriting input panel for full screen handwriting input. @@ -315,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 } } } |