4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-28 18:56:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3576

Browse Source 
4e2b1ce Transfer: don't overlap inside borders; fix margins (rating89us)
This commit is contained in:
luigi1111 2021-06-21 13:40:36 -05:00
commit afc2b35ed0
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pages/Transfer.qml
View File

@ -360,7 +360,8 @@ Rectangle {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -1
Layout.rightMargin: recipientLayout.thirdRowWidth Layout.leftMargin: 1
Layout.rightMargin: recipientLayout.thirdRowWidth + 1
color: MoneroComponents.Style.inputBorderColorInActive color: MoneroComponents.Style.inputBorderColorInActive
height: 1 height: 1
visible: index > 0 visible: index > 0
@ -373,8 +374,8 @@ Rectangle {
KeyNavigation.backtab: index > 0 ? recipientRepeater.itemAt(index - 1).children[1].children[2] : sendButton KeyNavigation.backtab: index > 0 ? recipientRepeater.itemAt(index - 1).children[1].children[2] : sendButton
KeyNavigation.tab: parent.children[2] KeyNavigation.tab: parent.children[2]
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.topMargin: recipientLayout.rowSpacing / 2 Layout.topMargin: index > 0 ? 0 : 1
Layout.bottomMargin: recipientLayout.rowSpacing / 2 Layout.bottomMargin: 2
Layout.fillWidth: true Layout.fillWidth: true
addressValidation: true addressValidation: true
borderDisabled: true borderDisabled: true
@ -453,6 +454,8 @@ Rectangle {
Rectangle { Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
Layout.topMargin: index > 0 ? 0 : 1
Layout.bottomMargin: 1
Layout.leftMargin: recipientLayout.colSpacing / 2 - width Layout.leftMargin: recipientLayout.colSpacing / 2 - width
Layout.rightMargin: recipientLayout.colSpacing / 2 Layout.rightMargin: recipientLayout.colSpacing / 2
color: MoneroComponents.Style.inputBorderColorInActive color: MoneroComponents.Style.inputBorderColorInActive
@ -463,8 +466,8 @@ Rectangle {
KeyNavigation.backtab: parent.children[0] KeyNavigation.backtab: parent.children[0]
KeyNavigation.tab: index + 1 < recipientRepeater.count ? recipientRepeater.itemAt(index + 1).children[1].children[0] : sendButton KeyNavigation.tab: index + 1 < recipientRepeater.count ? recipientRepeater.itemAt(index + 1).children[1].children[0] : sendButton
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.topMargin: recipientLayout.rowSpacing / 2 Layout.topMargin: index > 0 ? 0 : 1
Layout.bottomMargin: recipientLayout.rowSpacing / 2 Layout.bottomMargin: 2
Layout.rightMargin: recipientLayout.colSpacing / 2 Layout.rightMargin: recipientLayout.colSpacing / 2
Layout.preferredWidth: 125 Layout.preferredWidth: 125
Layout.maximumWidth: 125 Layout.maximumWidth: 125
@ -549,7 +552,7 @@ Rectangle {
Layout.column: 0 Layout.column: 0
Layout.row: 0 Layout.row: 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: recipientModel.count > 1 ? 0 : 5 Layout.topMargin: recipientModel.count > 1 ? 0 : -1
spacing: 0 spacing: 0
CheckBox { CheckBox {
@ -589,6 +592,7 @@ Rectangle {
Layout.column: 1 Layout.column: 1
Layout.row: 0 Layout.row: 0
Layout.preferredWidth: recipientLayout.secondRowWidth Layout.preferredWidth: recipientLayout.secondRowWidth
Layout.topMargin: recipientModel.count > 1 ? 0 : -1
Layout.maximumWidth: recipientLayout.secondRowWidth Layout.maximumWidth: recipientLayout.secondRowWidth
borderDisabled: true borderDisabled: true
fontFamily: MoneroComponents.Style.fontMonoRegular.name fontFamily: MoneroComponents.Style.fontMonoRegular.name
@ -618,7 +622,7 @@ Rectangle {
Layout.column: 1 Layout.column: 1
Layout.row: recipientModel.count > 1 ? 1 : 0 Layout.row: recipientModel.count > 1 ? 1 : 0
Layout.preferredWidth: recipientLayout.secondRowWidth Layout.preferredWidth: recipientLayout.secondRowWidth
Layout.topMargin: recipientModel.count > 1 ? 0 : 5 Layout.topMargin: recipientModel.count > 1 ? 0 : -1
Layout.maximumWidth: recipientLayout.secondRowWidth Layout.maximumWidth: recipientLayout.secondRowWidth
borderDisabled: true borderDisabled: true
fontFamily: MoneroComponents.Style.fontMonoRegular.name fontFamily: MoneroComponents.Style.fontMonoRegular.name
@ -638,7 +642,7 @@ Rectangle {
Layout.column: 2 Layout.column: 2
Layout.row: recipientModel.count > 1 ? 1 : 0 Layout.row: recipientModel.count > 1 ? 1 : 0
Layout.preferredWidth: recipientLayout.thirdRowWidth Layout.preferredWidth: recipientLayout.thirdRowWidth
Layout.topMargin: recipientModel.count > 1 ? 0 : 5 Layout.topMargin: recipientModel.count > 1 ? 0 : -1
Layout.maximumWidth: recipientLayout.thirdRowWidth Layout.maximumWidth: recipientLayout.thirdRowWidth
font.family: MoneroComponents.Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter