aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthotbot <thotbot@protonmail.com>2019-12-20 14:26:45 +0000
committerthotbot <thotbot@protonmail.com>2019-12-20 16:15:36 +0000
commit10dea6073bbed4ad58b0b2cf4128e4d60f2a47b5 (patch)
tree0bf90326b22f0c93475d613298d6c08c22e0f44d
parent500c7ec82e1d0d8b0f1fb45e2649a7795d4e5a22 (diff)
downloadmonzero-gui-10dea6073bbed4ad58b0b2cf4128e4d60f2a47b5.tar.gz
monzero-gui-10dea6073bbed4ad58b0b2cf4128e4d60f2a47b5.tar.xz
monzero-gui-10dea6073bbed4ad58b0b2cf4128e4d60f2a47b5.zip
Settings: fix page height
-rw-r--r--pages/settings/Settings.qml5
-rw-r--r--pages/settings/SettingsInfo.qml2
-rw-r--r--pages/settings/SettingsLayout.qml2
-rw-r--r--pages/settings/SettingsLog.qml2
-rw-r--r--pages/settings/SettingsNode.qml2
-rw-r--r--pages/settings/SettingsWallet.qml2
6 files changed, 10 insertions, 5 deletions
diff --git a/pages/settings/Settings.qml b/pages/settings/Settings.qml
index 332fe25e..c0c09d1a 100644
--- a/pages/settings/Settings.qml
+++ b/pages/settings/Settings.qml
@@ -83,18 +83,23 @@ ColumnLayout {
State {
name: "Wallet"
PropertyChanges { target: settingsStateView; currentView: settingsStateView.settingsWalletView }
+ PropertyChanges { target: settingsPage; settingsHeight: settingsStateView.settingsWalletView.settingsHeight + 140 }
}, State {
name: "UI"
PropertyChanges { target: settingsStateView; currentView: settingsStateView.settingsLayoutView }
+ PropertyChanges { target: settingsPage; settingsHeight: settingsStateView.settingsLayoutView.layoutHeight + 140 }
}, State {
name: "Node"
PropertyChanges { target: settingsStateView; currentView: settingsStateView.settingsNodeView }
+ PropertyChanges { target: settingsPage; settingsHeight: settingsStateView.settingsNodeView.nodeHeight + 140 }
}, State {
name: "Log"
PropertyChanges { target: settingsStateView; currentView: settingsStateView.settingsLogView }
+ PropertyChanges { target: settingsPage; settingsHeight: settingsStateView.settingsLogView.logHeight + 140 }
}, State {
name: "Info"
PropertyChanges { target: settingsStateView; currentView: settingsStateView.settingsInfoView }
+ PropertyChanges { target: settingsPage; settingsHeight: settingsStateView.settingsInfoView.infoHeight + 140 }
}
]
diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
index 75420d72..91b301ff 100644
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -39,8 +39,8 @@ import "../../components" as MoneroComponents
Rectangle {
color: "transparent"
- height: 1400
Layout.fillWidth: true
+ property alias infoHeight: infoLayout.height
property string walletModeString: {
if(appWindow.walletMode === 0){
return qsTr("Simple mode") + translationManager.emptyString;
diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml
index f2606a7e..56d459cc 100644
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -37,8 +37,8 @@ import "../../components" as MoneroComponents
Rectangle {
color: "transparent"
- height: 1400
Layout.fillWidth: true
+ property alias layoutHeight: settingsUI.height
ColumnLayout {
id: settingsUI
diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml
index 05101376..48fbe195 100644
--- a/pages/settings/SettingsLog.qml
+++ b/pages/settings/SettingsLog.qml
@@ -37,8 +37,8 @@ import "../../components" as MoneroComponents
Rectangle {
property alias consoleArea: consoleArea
color: "transparent"
- height: 1400
Layout.fillWidth: true
+ property alias logHeight: settingsLog.height
ColumnLayout {
id: settingsLog
diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
index 424f51cf..f350aef1 100644
--- a/pages/settings/SettingsNode.qml
+++ b/pages/settings/SettingsNode.qml
@@ -36,8 +36,8 @@ import "../../components/effects" as MoneroEffects
Rectangle{
color: "transparent"
- height: 1400
Layout.fillWidth: true
+ property alias nodeHeight: root.height
/* main layout */
ColumnLayout {
diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml
index 92630818..a17d60ef 100644
--- a/pages/settings/SettingsWallet.qml
+++ b/pages/settings/SettingsWallet.qml
@@ -36,8 +36,8 @@ import "../../components" as MoneroComponents
Rectangle {
color: "transparent"
- height: 1400
Layout.fillWidth: true
+ property alias settingsHeight: settingsWallet.height
ColumnLayout {
id: settingsWallet