diff options
| author | Sander Ferdinand <sa.ferdinand@gmail.com> | 2018-04-21 21:58:00 +0200 |
|---|---|---|
| committer | Sander Ferdinand <sa.ferdinand@gmail.com> | 2018-04-25 16:31:13 +0200 |
| commit | 47f9a1765a4f5f02b22475fdfb30c6b71e5a57be (patch) | |
| tree | 043e2007f725b86e7ba69b1ea4cc5d498b33f5a7 | |
| parent | acefb965202f0b5f7c841b0b98628d52334ce9b1 (diff) | |
| download | monzero-gui-47f9a1765a4f5f02b22475fdfb30c6b71e5a57be.tar.gz monzero-gui-47f9a1765a4f5f02b22475fdfb30c6b71e5a57be.tar.xz monzero-gui-47f9a1765a4f5f02b22475fdfb30c6b71e5a57be.zip | |
Modify password dialog and move customdecorations function out of main.qml
| -rw-r--r-- | components/NewPasswordDialog.qml | 8 | ||||
| -rw-r--r-- | components/PasswordDialog.qml | 10 | ||||
| -rw-r--r-- | main.qml | 24 |
3 files changed, 6 insertions, 36 deletions
diff --git a/components/NewPasswordDialog.qml b/components/NewPasswordDialog.qml index d83364de..d94b5407 100644 --- a/components/NewPasswordDialog.qml +++ b/components/NewPasswordDialog.qml @@ -38,13 +38,7 @@ import "../components" as MoneroComponents Item { id: root visible: false - Rectangle { - id: bg - z: parent.z + 1 - anchors.fill: parent - color: "black" - opacity: 0.8 - } + z: parent.z + 2 property alias password: passwordInput1.text diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 1f75f461..1534e1f3 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -38,6 +38,7 @@ import "../components" as MoneroComponents Item { id: root visible: false + z: parent.z + 2 property alias password: passwordInput.text property string walletName @@ -48,6 +49,7 @@ Item { signal closeCallback() function open(walletName) { + inactiveOverlay.visible = true // draw appwindow inactive root.walletName = walletName ? walletName : "" leftPanel.enabled = false middlePanel.enabled = false @@ -59,6 +61,7 @@ Item { } function close() { + inactiveOverlay.visible = false leftPanel.enabled = true middlePanel.enabled = true titleBar.enabled = true @@ -166,11 +169,4 @@ Item { } } - Rectangle { - id: bg - - anchors.fill: parent - color: "black" - opacity: 0.8 - } } @@ -40,6 +40,7 @@ import moneroComponents.NetworkType 1.0 import "components" import "wizard" +import "js/Windows.js" as Windows ApplicationWindow { id: appWindow @@ -933,30 +934,9 @@ ApplicationWindow { // width: screenWidth //rightPanelExpanded ? 1269 : 1269 - 300 // height: 900 //300//maxWindowHeight; color: "#FFFFFF" - flags: persistentSettings.customDecorations ? (Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint) : (Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint | Qt.WindowMaximizeButtonHint) + flags: persistentSettings.customDecorations ? Windows.flagsCustomDecorations : Windows.flags onWidthChanged: x -= 0 - function setCustomWindowDecorations(custom) { - var x = appWindow.x - var y = appWindow.y - if (x < 0) - x = 0 - if (y < 0) - y = 0 - persistentSettings.customDecorations = custom; - titleBar.visible = custom; // hides custom titlebar based on customDecorations - - if (custom) - appWindow.flags = Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint; - else - appWindow.flags = Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint | Qt.WindowMaximizeButtonHint; - - appWindow.hide() - appWindow.x = x - appWindow.y = y - appWindow.show() - } - Component.onCompleted: { x = (Screen.width - width) / 2 y = (Screen.height - maxWindowHeight) / 2 |