From 1d5937e1e8587702952870758961d5e4a9e1e784 Mon Sep 17 00:00:00 2001 From: mmbyday Date: Sun, 16 Dec 2018 19:27:27 -0800 Subject: [PATCH] wizard: add close button by enabling titlebar --- components/TitleBar.qml | 2 ++ main.qml | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/TitleBar.qml b/components/TitleBar.qml index 0b6c9eef..a759adce 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -55,6 +55,7 @@ Rectangle { property bool showCloseButton: true property bool showMoneroLogo: false property bool small: false + property alias titleBarGradientImageOpacity: titleBarGradientImage.opacity signal closeClicked signal maximizeClicked @@ -68,6 +69,7 @@ Rectangle { z: parent.z + 1 Image { + id: titleBarGradientImage anchors.fill: parent height: titleBar.height width: titleBar.width diff --git a/main.qml b/main.qml index 168473f9..7b9c4cd6 100644 --- a/main.qml +++ b/main.qml @@ -1274,11 +1274,13 @@ ApplicationWindow { PropertyChanges { target: appWindow; width: (screenWidth < 930 || isAndroid || isIOS)? screenWidth : 930; } PropertyChanges { target: appWindow; height: maxWindowHeight; } PropertyChanges { target: resizeArea; visible: true } - PropertyChanges { target: titleBar; showMaximizeButton: false } + PropertyChanges { target: titleBar; showMaximizeButton: true } // PropertyChanges { target: frameArea; blocked: true } - PropertyChanges { target: titleBar; visible: false } + PropertyChanges { target: titleBar; visible: true } PropertyChanges { target: titleBar; y: 0 } - PropertyChanges { target: titleBar; title: qsTr("Program setup wizard") + translationManager.emptyString } + PropertyChanges { target: titleBar; showMoneroLogo: false } + PropertyChanges { target: titleBar; titleBarGradientImageOpacity: 0.2 } + PropertyChanges { target: titleBar; small: true } PropertyChanges { target: mobileHeader; visible: false } }, State { name: "normal"