diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-25 15:27:19 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-25 15:27:19 -0500 |
| commit | b0ba2379f4c657999510b054a22cb5c906e71e8a (patch) | |
| tree | 5d5c4d35786fb65052784fe6a70e3d08dac2eb01 /MiddlePanel.qml | |
| parent | 5887f87677b40b70b689e20056a57957157ed481 (diff) | |
| parent | 62285b01dc77ef14e4b5b9cc291e34162321ad89 (diff) | |
| download | monzero-gui-b0ba2379f4c657999510b054a22cb5c906e71e8a.tar.gz monzero-gui-b0ba2379f4c657999510b054a22cb5c906e71e8a.tar.xz monzero-gui-b0ba2379f4c657999510b054a22cb5c906e71e8a.zip | |
Merge pull request #2069
62285b0 Remove scaleRatio (xmrdsc)
Diffstat (limited to 'MiddlePanel.qml')
| -rw-r--r-- | MiddlePanel.qml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 015e53a8..932c95f6 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -51,7 +51,7 @@ Rectangle { property string balanceText property string unlockedBalanceLabelText: qsTr("Unlocked Balance") + translationManager.emptyString property string unlockedBalanceText - property int minHeight: (appWindow.height > 800) ? appWindow.height : 800 * scaleRatio + property int minHeight: (appWindow.height > 800) ? appWindow.height : 800 property alias contentHeight: mainFlickable.contentHeight property alias flickable: mainFlickable @@ -125,11 +125,11 @@ Rectangle { State { name: "History" PropertyChanges { target: root; currentView: historyView } - PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 100 * scaleRatio} + PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 100} }, State { name: "Transfer" PropertyChanges { target: root; currentView: transferView } - PropertyChanges { target: mainFlickable; contentHeight: 700 * scaleRatio } + PropertyChanges { target: mainFlickable; contentHeight: 700 } }, State { name: "Receive" PropertyChanges { target: root; currentView: receiveView } @@ -141,7 +141,7 @@ Rectangle { }, State { name: "TxKey" PropertyChanges { target: root; currentView: txkeyView } - PropertyChanges { target: mainFlickable; contentHeight: 1200 * scaleRatio } + PropertyChanges { target: mainFlickable; contentHeight: 1200 } }, State { name: "SharedRingDB" PropertyChanges { target: root; currentView: sharedringdbView } @@ -153,7 +153,7 @@ Rectangle { }, State { name: "Sign" PropertyChanges { target: root; currentView: signView } - PropertyChanges { target: mainFlickable; contentHeight: 1000 * scaleRatio } + PropertyChanges { target: mainFlickable; contentHeight: 1000 } }, State { name: "Settings" PropertyChanges { target: root; currentView: settingsView } @@ -161,7 +161,7 @@ Rectangle { }, State { name: "Mining" PropertyChanges { target: root; currentView: miningView } - PropertyChanges { target: mainFlickable; contentHeight: 700 * scaleRatio} + PropertyChanges { target: mainFlickable; contentHeight: 700} }, State { name: "Keys" PropertyChanges { target: root; currentView: keysView } @@ -196,10 +196,10 @@ Rectangle { if(currentView === merchantView || currentView === historyView) return 0; - return 20 * scaleRatio; + return 20; } - anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 * scaleRatio : 0 + anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 : 0 spacing: 0 Flickable { |