Merge pull request #1762

b9c7d8d keys: dynamic panel height and qrcode is no longer clipped (mmbyday)
6 years ago · dcddaad2be
parent f5c428b546 b9c7d8d7b1
commit dcddaad2be
2 changed files with 2 additions and 1 deletions
--- 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 }
            }
        ]

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