Merge pull request #1831

1d5937e wizard: add close button by enabling titlebar (mmbyday)
This commit is contained in:
luigi1111 2018-12-18 09:48:24 -06:00
commit 8ea0c16390
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 7 additions and 3 deletions

View File

@ -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

View File

@ -1275,11 +1275,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"