MiddlePanel: dynamic content height

This commit is contained in:
selsta 2019-05-07 07:19:40 +02:00
parent 3c1fe1da8b
commit 96945c2c79
No known key found for this signature in database
GPG key ID: 2EA0A99A8B07AE5E
6 changed files with 28 additions and 30 deletions

View file

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

View file

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

View file

@ -35,6 +35,7 @@ import moneroComponents.Wallet 1.0
Rectangle {
id: root
color: "transparent"
property alias miningHeight: mainLayout.height
property double currentHashRate: 0
ColumnLayout {

View file

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

View file

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

View file

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