From 6187ed3df6f8f749259ed059e56ba0ed85dea8fd Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Fri, 15 Jun 2018 09:53:25 +0300 Subject: Don't show demo header on launcher settings view Task-number: QTBUG-68650 Change-Id: I401bead57a3e42efde6bf2905bc3a9090026d2fb Reviewed-by: Sami Nurmenniemi --- qml/MainWindow.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qml/MainWindow.qml b/qml/MainWindow.qml index c2050da..431d592 100644 --- a/qml/MainWindow.qml +++ b/qml/MainWindow.qml @@ -85,6 +85,7 @@ Item { id: root anchors.centerIn: parent property bool portraitMode: Screen.desktopAvailableHeight > Screen.desktopAvailableWidth ? true : false + property bool demoHeaderEnabled: applicationLoader.sourceComponent !== settingsUIComponent rotation: portraitMode ? 90 : 0 width: portraitMode ? window.height : window.width height: portraitMode ? window.width : window.height @@ -175,7 +176,7 @@ Item { opacity: 0; visible: opacity > 0.1 - anchors.top: demoHeader.bottom + anchors.top: root.demoHeaderEnabled ? demoHeader.bottom : root.top anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right @@ -195,7 +196,7 @@ Item { DemoHeader { id: demoHeader - visible: applicationLoader.visible + visible: applicationLoader.visible && root.demoHeaderEnabled onInfoClicked: demoInfoPopup.open() onCloseClicked: root.closeApplication(); } -- cgit v1.2.3