github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-13 16:08:57 +01:00
Code Releases Activity

Merge pull request #2650

Browse Source 
10dea60 Settings: fix page height (tobtoht)
This commit is contained in:
luigi1111 2019-12-21 18:09:53 -05:00
commit 8d0647d677
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/settings/Settings.qml
View File

@ -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 }
}
]

2
pages/settings/SettingsInfo.qml
View File

@ -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;

2
pages/settings/SettingsLayout.qml
View File

@ -37,8 +37,8 @@ import "../../components" as MoneroComponents
Rectangle {
color: "transparent"
height: 1400
Layout.fillWidth: true
property alias layoutHeight: settingsUI.height
ColumnLayout {
id: settingsUI

2
pages/settings/SettingsLog.qml
View File

@ -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

2
pages/settings/SettingsNode.qml
View File

@ -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 {

2
pages/settings/SettingsWallet.qml
View File

@ -36,8 +36,8 @@ import "../../components" as MoneroComponents
Rectangle {
color: "transparent"
height: 1400
Layout.fillWidth: true
property alias settingsHeight: settingsWallet.height
ColumnLayout {
id: settingsWallet