Merge pull request #2164

96945c2 MiddlePanel: dynamic content height (selsta)

6 files changed, 28 insertions, 30 deletions

diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index db49aa29..614aa6ed 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -125,51 +125,51 @@ Rectangle {
             State {
                 name: "History"
                 PropertyChanges { target: root; currentView: historyView }
-                PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 100}
+                PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 80}
             }, State {
                 name: "Transfer"
                 PropertyChanges { target: root; currentView: transferView }
-                PropertyChanges { target: mainFlickable; contentHeight: 700 }
+                PropertyChanges { target: mainFlickable; contentHeight: transferView.transferHeight1 + transferView.transferHeight2 + 80 }
             }, State {
-               name: "Receive"
-               PropertyChanges { target: root; currentView: receiveView }
-               PropertyChanges { target: mainFlickable; contentHeight: receiveView.receiveHeight + 100 }
+                name: "Receive"
+                PropertyChanges { target: root; currentView: receiveView }
+                PropertyChanges { target: mainFlickable; contentHeight: receiveView.receiveHeight + 80 }
             }, State {
                 name: "Merchant"
                 PropertyChanges { target: root; currentView: merchantView }
-                PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 100 }
+                PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 80 }
             }, State {
-               name: "TxKey"
-               PropertyChanges { target: root; currentView: txkeyView }
-               PropertyChanges { target: mainFlickable; contentHeight: 1200  }
+                name: "TxKey"
+                PropertyChanges { target: root; currentView: txkeyView }
+                PropertyChanges { target: mainFlickable; contentHeight: txkeyView.txkeyHeight + 80 }
             }, State {
-               name: "SharedRingDB"
-               PropertyChanges { target: root; currentView: sharedringdbView }
-               PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 100  }
+                name: "SharedRingDB"
+                PropertyChanges { target: root; currentView: sharedringdbView }
+                PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 80  }
             }, State {
                 name: "AddressBook"
-                PropertyChanges {  target: root; currentView: addressBookView  }
-                PropertyChanges { target: mainFlickable; contentHeight: minHeight }
+                PropertyChanges { target: root; currentView: addressBookView }
+                PropertyChanges { target: mainFlickable; contentHeight: addressBookView.addressbookHeight + 80 }
             }, State {
                 name: "Sign"
-               PropertyChanges { target: root; currentView: signView }
-               PropertyChanges { target: mainFlickable; contentHeight: 1000  }
+                PropertyChanges { target: root; currentView: signView }
+                PropertyChanges { target: mainFlickable; contentHeight: signView.signHeight + 80 }
             }, State {
                 name: "Settings"
-               PropertyChanges { target: root; currentView: settingsView }
-               PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight }
+                PropertyChanges { target: root; currentView: settingsView }
+                PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight }
             }, State {
                 name: "Mining"
                 PropertyChanges { target: root; currentView: miningView }
-                PropertyChanges { target: mainFlickable; contentHeight: 700}
+                PropertyChanges { target: mainFlickable; contentHeight: miningView.miningHeight + 80 }
             }, State {
                 name: "Keys"
                 PropertyChanges { target: root; currentView: keysView }
-                PropertyChanges { target: mainFlickable; contentHeight: keysView.keysHeight }
+                PropertyChanges { target: mainFlickable; contentHeight: keysView.keysHeight + 80}
             }, State {
                 name: "Account"
                 PropertyChanges { target: root; currentView: accountView }
-                PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 100 }
+                PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 80 }
             }	
         ]
 
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index 864fcd52..b79a150b 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -44,6 +44,7 @@ import FontAwesome 1.0
 Rectangle {
     id: root
     color: "transparent"
+    property alias addressbookHeight: mainLayout.height
     property bool selectAndSend: false
     property bool editEntry: false
 
diff --git a/pages/Mining.qml b/pages/Mining.qml
index 55ac8c3e..e45cfaf1 100644
--- a/pages/Mining.qml
+++ b/pages/Mining.qml
@@ -35,6 +35,7 @@ import moneroComponents.Wallet 1.0
 Rectangle {
     id: root
     color: "transparent"
+    property alias miningHeight: mainLayout.height
     property double currentHashRate: 0
 
     ColumnLayout {
diff --git a/pages/Sign.qml b/pages/Sign.qml
index 6cd2276f..1df35fe5 100644
--- a/pages/Sign.qml
+++ b/pages/Sign.qml
@@ -37,6 +37,7 @@ import moneroComponents.WalletManager 1.0
 import "../components" as MoneroComponents
 
 Rectangle {
+    property alias signHeight: mainLayout.height
     property bool messageMode: true
     property bool fileMode: false
 
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 7ecc0479..542f44ed 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -47,6 +47,8 @@ Rectangle {
     signal sweepUnmixableClicked()
 
     color: "transparent"
+    property alias transferHeight1: pageRoot.height
+    property alias transferHeight2: advancedLayout.height
     property int mixin: 10  // (ring size 11)
     property string warningContent: ""
     property string sendButtonWarning: ""
@@ -435,15 +437,8 @@ Rectangle {
 
     } // pageRoot
 
-    Rectangle {
-        id: desaturate
-        color:"black"
-        anchors.fill: parent
-        opacity: 0.1
-        visible: (pageRoot.enabled)? 0 : 1;
-    }
-
     ColumnLayout {
+        id: advancedLayout
         anchors.top: pageRoot.bottom
         anchors.left: parent.left
         anchors.right: parent.right
diff --git a/pages/TxKey.qml b/pages/TxKey.qml
index 5a53b7b0..4cb9f8f5 100644
--- a/pages/TxKey.qml
+++ b/pages/TxKey.qml
@@ -37,8 +37,8 @@ import moneroComponents.Clipboard 1.0
 import "../js/TxUtils.js" as TxUtils
 
 Rectangle {
-
     color: "transparent"
+    property alias txkeyHeight: mainLayout.height
 
     Clipboard { id: clipboard }