4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-07 16:43:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #193

Browse Source 
cca825b fix height after switching layout mode (Jacob Brydolf)
f1157f8 adjust height for small screens + fix window positioning (Jacob Brydolf)
This commit is contained in:
Riccardo Spagni 2016-11-24 12:38:09 +02:00
commit ad9a1f6cae
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.qml
View File

@ -58,6 +58,7 @@ ApplicationWindow {
property bool isNewWallet: false property bool isNewWallet: false
property int restoreHeight:0 property int restoreHeight:0
property bool daemonSynced: false property bool daemonSynced: false
property int maxWindowHeight: (Screen.height < 900)? 720 : 800;
// true if wallet ever synchronized // true if wallet ever synchronized
property bool walletInitialized : false property bool walletInitialized : false
@ -617,7 +618,7 @@ ApplicationWindow {
objectName: "appWindow" objectName: "appWindow"
visible: true visible: true
width: rightPanelExpanded ? 1269 : 1269 - 300 width: rightPanelExpanded ? 1269 : 1269 - 300
height: 800 height: maxWindowHeight;
color: "#FFFFFF" color: "#FFFFFF"
flags: Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint flags: Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint
onWidthChanged: x -= 0 onWidthChanged: x -= 0
@ -625,7 +626,7 @@ ApplicationWindow {
Component.onCompleted: { Component.onCompleted: {
x = (Screen.width - width) / 2 x = (Screen.width - width) / 2
y = (Screen.height - height) / 2 y = (Screen.height - maxWindowHeight) / 2
// //
walletManager.walletOpened.connect(onWalletOpened); walletManager.walletOpened.connect(onWalletOpened);
walletManager.walletClosed.connect(onWalletClosed); walletManager.walletClosed.connect(onWalletClosed);
@ -759,7 +760,7 @@ ApplicationWindow {
PropertyChanges { target: titleBar; basicButtonVisible: true } PropertyChanges { target: titleBar; basicButtonVisible: true }
PropertyChanges { target: wizard; visible: false } PropertyChanges { target: wizard; visible: false }
PropertyChanges { target: appWindow; width: rightPanelExpanded ? 1269 : 1269 - 300; } PropertyChanges { target: appWindow; width: rightPanelExpanded ? 1269 : 1269 - 300; }
PropertyChanges { target: appWindow; height: 800; } PropertyChanges { target: appWindow; height: maxWindowHeight; }
PropertyChanges { target: resizeArea; visible: true } PropertyChanges { target: resizeArea; visible: true }
PropertyChanges { target: titleBar; maximizeButtonVisible: true } PropertyChanges { target: titleBar; maximizeButtonVisible: true }
PropertyChanges { target: frameArea; blocked: false } PropertyChanges { target: frameArea; blocked: false }
@ -921,7 +922,7 @@ ApplicationWindow {
NumberAnimation { NumberAnimation {
target: appWindow target: appWindow
properties: "height" properties: "height"
to: 800 to: maxWindowHeight
easing.type: Easing.InCubic easing.type: Easing.InCubic
duration: 200 duration: 200
} }