diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-12-01 12:59:34 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-12-01 12:59:34 -0600 |
| commit | dcddaad2be0a9405b8cc29dff7b54081c167beef (patch) | |
| tree | e24efcaa8f36b08c0d2aaf5008492a98cc7d60f5 | |
| parent | f5c428b546b4b2d46b2181f765ca6f3ef5f75ef4 (diff) | |
| parent | b9c7d8d7b1aff13a2e2ed71751b2a89da1bcfcae (diff) | |
| download | monzero-gui-dcddaad2be0a9405b8cc29dff7b54081c167beef.tar.gz monzero-gui-dcddaad2be0a9405b8cc29dff7b54081c167beef.tar.xz monzero-gui-dcddaad2be0a9405b8cc29dff7b54081c167beef.zip | |
Merge pull request #1762
b9c7d8d keys: dynamic panel height and qrcode is no longer clipped (mmbyday)
| -rw-r--r-- | MiddlePanel.qml | 2 | ||||
| -rw-r--r-- | pages/Keys.qml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 1b1a4a83..7a2dff31 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -150,7 +150,7 @@ Rectangle { }, State { name: "Keys" PropertyChanges { target: root; currentView: keysView } - PropertyChanges { target: mainFlickable; contentHeight: minHeight + 200 * scaleRatio } + PropertyChanges { target: mainFlickable; contentHeight: keysView.keysHeight } } ] diff --git a/pages/Keys.qml b/pages/Keys.qml index d1eb67a4..4a7cca44 100644 --- a/pages/Keys.qml +++ b/pages/Keys.qml @@ -40,6 +40,7 @@ import "." 1.0 Rectangle { property bool viewOnly: false id: page + property int keysHeight: mainLayout.height + 100 * scaleRatio // Ensure sufficient height for QR code, even in minimum width window case. color: "transparent" |