diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-12-18 09:48:24 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-12-18 09:48:24 -0600 |
| commit | 8ea0c16390e0e5181edac658c496977ca327cba4 (patch) | |
| tree | 2e6d1c150fdf03bfcf15a7c9ee61e4fcf4f6133e | |
| parent | 83f8508f560f5d1fae7452621e35c6d554a577de (diff) | |
| parent | 1d5937e1e8587702952870758961d5e4a9e1e784 (diff) | |
| download | monzero-gui-8ea0c16390e0e5181edac658c496977ca327cba4.tar.gz monzero-gui-8ea0c16390e0e5181edac658c496977ca327cba4.tar.xz monzero-gui-8ea0c16390e0e5181edac658c496977ca327cba4.zip | |
Merge pull request #1831
1d5937e wizard: add close button by enabling titlebar (mmbyday)
| -rw-r--r-- | components/TitleBar.qml | 2 | ||||
| -rw-r--r-- | 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 @@ -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" |