diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-04-24 21:35:52 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-04-24 21:35:52 -0500 |
| commit | 631560c95aa40c2dadd9439399b2300203ef4027 (patch) | |
| tree | 794976eb5aba58db515198be20c7f17e0ea8c636 | |
| parent | 5a5d92e6f64a85b251c89bf95e1ffc5dc438f089 (diff) | |
| parent | 25e5b3528e5e7f8caeeb17a19600ac6aed53adf9 (diff) | |
| download | monzero-gui-631560c95aa40c2dadd9439399b2300203ef4027.tar.gz monzero-gui-631560c95aa40c2dadd9439399b2300203ef4027.tar.xz monzero-gui-631560c95aa40c2dadd9439399b2300203ef4027.zip | |
Merge pull request #1336
25e5b35 dynamic panel height for the settings page
| -rw-r--r-- | MiddlePanel.qml | 2 | ||||
| -rw-r--r-- | pages/Settings.qml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 3cc2163f..b4c56af8 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -141,7 +141,7 @@ Rectangle { }, State { name: "Settings" PropertyChanges { target: root; currentView: settingsView } - PropertyChanges { target: mainFlickable; contentHeight: 2000 * scaleRatio } + PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight + 100 } }, State { name: "Mining" PropertyChanges { target: root; currentView: miningView } diff --git a/pages/Settings.qml b/pages/Settings.qml index 7c0a9bb5..2acc8110 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -39,6 +39,7 @@ import moneroComponents.Clipboard 1.0 Rectangle { property bool viewOnly: false + property alias settingsHeight: mainLayout.height id: page color: "transparent" |