From 1613605296fda239f7c638fecb9827c6ab945505 Mon Sep 17 00:00:00 2001 From: PavelS Date: Fri, 5 Aug 2022 15:07:03 +0300 Subject: [PATCH] fix(@desktop/wallet) adjust network dropdown Fixes #6486 --- .../AppLayouts/Wallet/controls/NetworkFilter.qml | 3 ++- .../Wallet/popups/NetworkSelectPopup.qml | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml index 66ac6951e7..4d82b3de3e 100644 --- a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml +++ b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml @@ -94,7 +94,8 @@ Item { NetworkSelectPopup { id: selectPopup - x: (parent.width - width) + x: (parent.width - width + 5) + y: (selectRectangle.height + 5) layer1Networks: store.layer1Networks layer2Networks: store.layer2Networks testNetworks: store.testNetworks diff --git a/ui/app/AppLayouts/Wallet/popups/NetworkSelectPopup.qml b/ui/app/AppLayouts/Wallet/popups/NetworkSelectPopup.qml index 51d7f9de1f..f0ca36ae22 100644 --- a/ui/app/AppLayouts/Wallet/popups/NetworkSelectPopup.qml +++ b/ui/app/AppLayouts/Wallet/popups/NetworkSelectPopup.qml @@ -16,6 +16,10 @@ Popup { modal: false width: 360 height: 432 + + horizontalPadding: 5 + verticalPadding: 5 + closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent property var layer1Networks property var layer2Networks @@ -43,13 +47,14 @@ Popup { contentHeight: content.height width: popup.width height: popup.height + padding: 0 ScrollBar.horizontal.policy: ScrollBar.AlwaysOff Column { id: content width: scrollView.availableWidth - spacing: Style.current.padding + spacing: 4 Repeater { id: chainRepeater1 @@ -62,6 +67,11 @@ Popup { font.pixelSize: Style.current.primaryTextFontSize color: Theme.palette.baseColor1 text: qsTr("Layer 2") + height: 40 + leftPadding: 16 + topPadding: 10 + verticalAlignment: Text.AlignVCenter + visible: chainRepeater2.count > 0 } @@ -84,8 +94,11 @@ Popup { Component { id: chainItem StatusListItem { + implicitHeight: 48 implicitWidth: scrollView.width title: model.chainName + image.height: 24 + image.width: 24 image.source: Style.svg(model.iconUrl) onClicked: { checkBox.checked = !checkBox.checked