diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-06-21 13:40:36 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-06-21 13:40:36 -0500 |
| commit | afc2b35ed0dd0395602d5c881c5ba869207646fa (patch) | |
| tree | 56f4c73070ec8c42636eff76d53c1793bffbd653 | |
| parent | 911488786664a0edeec4892b88cc27afcd27aa3b (diff) | |
| parent | 4e2b1cec953245639a6165f6c06ec89cbcaa8595 (diff) | |
| download | monzero-gui-afc2b35ed0dd0395602d5c881c5ba869207646fa.tar.gz monzero-gui-afc2b35ed0dd0395602d5c881c5ba869207646fa.tar.xz monzero-gui-afc2b35ed0dd0395602d5c881c5ba869207646fa.zip | |
Merge pull request #3576
4e2b1ce Transfer: don't overlap inside borders; fix margins (rating89us)
| -rw-r--r-- | pages/Transfer.qml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 4b921121..05231139 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -360,7 +360,8 @@ Rectangle { Rectangle { Layout.fillWidth: true Layout.topMargin: -1 - Layout.rightMargin: recipientLayout.thirdRowWidth + Layout.leftMargin: 1 + Layout.rightMargin: recipientLayout.thirdRowWidth + 1 color: MoneroComponents.Style.inputBorderColorInActive height: 1 visible: index > 0 @@ -373,8 +374,8 @@ Rectangle { KeyNavigation.backtab: index > 0 ? recipientRepeater.itemAt(index - 1).children[1].children[2] : sendButton KeyNavigation.tab: parent.children[2] Layout.alignment: Qt.AlignVCenter - Layout.topMargin: recipientLayout.rowSpacing / 2 - Layout.bottomMargin: recipientLayout.rowSpacing / 2 + Layout.topMargin: index > 0 ? 0 : 1 + Layout.bottomMargin: 2 Layout.fillWidth: true addressValidation: true borderDisabled: true @@ -453,6 +454,8 @@ Rectangle { Rectangle { Layout.fillHeight: true + Layout.topMargin: index > 0 ? 0 : 1 + Layout.bottomMargin: 1 Layout.leftMargin: recipientLayout.colSpacing / 2 - width Layout.rightMargin: recipientLayout.colSpacing / 2 color: MoneroComponents.Style.inputBorderColorInActive @@ -463,8 +466,8 @@ Rectangle { KeyNavigation.backtab: parent.children[0] KeyNavigation.tab: index + 1 < recipientRepeater.count ? recipientRepeater.itemAt(index + 1).children[1].children[0] : sendButton Layout.alignment: Qt.AlignVCenter - Layout.topMargin: recipientLayout.rowSpacing / 2 - Layout.bottomMargin: recipientLayout.rowSpacing / 2 + Layout.topMargin: index > 0 ? 0 : 1 + Layout.bottomMargin: 2 Layout.rightMargin: recipientLayout.colSpacing / 2 Layout.preferredWidth: 125 Layout.maximumWidth: 125 @@ -549,7 +552,7 @@ Rectangle { Layout.column: 0 Layout.row: 0 Layout.fillWidth: true - Layout.topMargin: recipientModel.count > 1 ? 0 : 5 + Layout.topMargin: recipientModel.count > 1 ? 0 : -1 spacing: 0 CheckBox { @@ -589,6 +592,7 @@ Rectangle { Layout.column: 1 Layout.row: 0 Layout.preferredWidth: recipientLayout.secondRowWidth + Layout.topMargin: recipientModel.count > 1 ? 0 : -1 Layout.maximumWidth: recipientLayout.secondRowWidth borderDisabled: true fontFamily: MoneroComponents.Style.fontMonoRegular.name @@ -618,7 +622,7 @@ Rectangle { Layout.column: 1 Layout.row: recipientModel.count > 1 ? 1 : 0 Layout.preferredWidth: recipientLayout.secondRowWidth - Layout.topMargin: recipientModel.count > 1 ? 0 : 5 + Layout.topMargin: recipientModel.count > 1 ? 0 : -1 Layout.maximumWidth: recipientLayout.secondRowWidth borderDisabled: true fontFamily: MoneroComponents.Style.fontMonoRegular.name @@ -638,7 +642,7 @@ Rectangle { Layout.column: 2 Layout.row: recipientModel.count > 1 ? 1 : 0 Layout.preferredWidth: recipientLayout.thirdRowWidth - Layout.topMargin: recipientModel.count > 1 ? 0 : 5 + Layout.topMargin: recipientModel.count > 1 ? 0 : -1 Layout.maximumWidth: recipientLayout.thirdRowWidth font.family: MoneroComponents.Style.fontRegular.name horizontalAlignment: Text.AlignHCenter |