aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-05-14 16:01:28 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-05-14 16:01:28 -0500
commit28ca9503df9fe93d37ef95c3bb4de03d73d118cb (patch)
tree0d7c9061b9b9f4671639c67abf80f5c8288a46a3
parent73cc400ae891b81a31465392d0f496cd1bac312c (diff)
parentd662e46146bf62135688dcd4afc594a1caf8ce9d (diff)
downloadmonzero-gui-28ca9503df9fe93d37ef95c3bb4de03d73d118cb.tar.gz
monzero-gui-28ca9503df9fe93d37ef95c3bb4de03d73d118cb.tar.xz
monzero-gui-28ca9503df9fe93d37ef95c3bb4de03d73d118cb.zip
Merge pull request #2897
d662e46 Merchant: display size warning when height < minHeight (rating89us)
-rw-r--r--pages/merchant/Merchant.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml
index 8602945a..7ed4cdc3 100644
--- a/pages/merchant/Merchant.qml
+++ b/pages/merchant/Merchant.qml
@@ -25,6 +25,7 @@ Item {
anchors.margins: 0
property int minWidth: 900
+ property int minHeight: 600
property int qrCodeSize: 220
property bool enableTracking: false
property string trackingError: "" // setting this will show a message @ tracking table
@@ -70,7 +71,7 @@ Item {
ColumnLayout {
id: mainLayout
- visible: parent.width >= root.minWidth
+ visible: parent.width >= root.minWidth && appWindow.height >= root.minHeight
spacing: 0
// emulates max-width + center for container
@@ -556,7 +557,7 @@ Item {
Rectangle {
// Shows when the window is too small
- visible: parent.width < root.minWidth
+ visible: parent.width < root.minWidth || appWindow.height < root.minHeight
anchors.top: parent.top
anchors.topMargin: 100;
anchors.horizontalCenter: parent.horizontalCenter