summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuho Annunen <juho.annunen@qt.io>2018-06-06 15:29:13 +0300
committerJuho Annunen <juho.annunen@qt.io>2018-06-06 12:52:02 +0000
commite4ebb7da2fa883c6f8a494a336ca45ea54466b27 (patch)
treec511f0600f41badd5432371bbe2d90bfdb412b54
parent9f4a530c091fe098fa9ea79affb816cbbe2d05b6 (diff)
Anchor demo loader under demo header
Task-number: QTBUG-68650 Change-Id: I04204e5105eeb8cdf760e1a8a5b84e211c03f5f4 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
-rw-r--r--qml/MainWindow.qml18
1 files changed, 11 insertions, 7 deletions
diff --git a/qml/MainWindow.qml b/qml/MainWindow.qml
index 7a83202..c2050da 100644
--- a/qml/MainWindow.qml
+++ b/qml/MainWindow.qml
@@ -175,7 +175,11 @@ Item {
opacity: 0;
visible: opacity > 0.1
- anchors.fill: parent
+ anchors.top: demoHeader.bottom
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+
asynchronous: true;
onStatusChanged: {
if (status == Loader.Error)
@@ -187,14 +191,14 @@ Item {
else if (applicationLoader.item.objectName !== "empty")
engine.state = "app-running";
}
-
- DemoHeader {
- id: demoHeader
- onInfoClicked: demoInfoPopup.open()
- onCloseClicked: root.closeApplication();
- }
}
+ DemoHeader {
+ id: demoHeader
+ visible: applicationLoader.visible
+ onInfoClicked: demoInfoPopup.open()
+ onCloseClicked: root.closeApplication();
+ }
Loader {
id: bootScreenLoader
visible: opacity > 0