mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-16 15:58:11 +00:00
Merge pull request #193
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:
commit
ad9a1f6cae
1 changed files with 5 additions and 4 deletions
9
main.qml
9
main.qml
|
@ -58,6 +58,7 @@ ApplicationWindow {
|
|||
property bool isNewWallet: false
|
||||
property int restoreHeight:0
|
||||
property bool daemonSynced: false
|
||||
property int maxWindowHeight: (Screen.height < 900)? 720 : 800;
|
||||
|
||||
// true if wallet ever synchronized
|
||||
property bool walletInitialized : false
|
||||
|
@ -617,7 +618,7 @@ ApplicationWindow {
|
|||
objectName: "appWindow"
|
||||
visible: true
|
||||
width: rightPanelExpanded ? 1269 : 1269 - 300
|
||||
height: 800
|
||||
height: maxWindowHeight;
|
||||
color: "#FFFFFF"
|
||||
flags: Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint
|
||||
onWidthChanged: x -= 0
|
||||
|
@ -625,7 +626,7 @@ ApplicationWindow {
|
|||
|
||||
Component.onCompleted: {
|
||||
x = (Screen.width - width) / 2
|
||||
y = (Screen.height - height) / 2
|
||||
y = (Screen.height - maxWindowHeight) / 2
|
||||
//
|
||||
walletManager.walletOpened.connect(onWalletOpened);
|
||||
walletManager.walletClosed.connect(onWalletClosed);
|
||||
|
@ -759,7 +760,7 @@ ApplicationWindow {
|
|||
PropertyChanges { target: titleBar; basicButtonVisible: true }
|
||||
PropertyChanges { target: wizard; visible: false }
|
||||
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: titleBar; maximizeButtonVisible: true }
|
||||
PropertyChanges { target: frameArea; blocked: false }
|
||||
|
@ -921,7 +922,7 @@ ApplicationWindow {
|
|||
NumberAnimation {
|
||||
target: appWindow
|
||||
properties: "height"
|
||||
to: 800
|
||||
to: maxWindowHeight
|
||||
easing.type: Easing.InCubic
|
||||
duration: 200
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue