summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuho Annunen <juho.annunen@qt.io>2018-08-24 12:27:29 +0300
committerJuho Annunen <juho.annunen@qt.io>2018-08-24 09:51:21 +0000
commitd1d81167b5621ee4bd4d3636c7ffc4df9602a22c (patch)
tree251c1461d97ea872453fb5f0a519da91a71ed5cc
parent56d6c566fc434c159d573eba07a4397e5aea3638 (diff)
Ensure that demo info popup window is above the demo header
Task-number: QTBUG-69952 Change-Id: Ia3e768f3c22735c1c8c2034d5cf58e2b5f54bab7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--qml/DemoInfoPopup.qml2
-rw-r--r--qml/MainWindow.qml4
2 files changed, 4 insertions, 2 deletions
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/MainWindow.qml b/qml/MainWindow.qml
index 2fb898d..060b9b5 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.