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

Merge pull request #3328

Browse Source 
2bb1092 LineEditMulti: right padding, fontFamily, backtab, inline btns vcenter (xiphon)
This commit is contained in:
luigi1111 2021-03-05 13:58:28 -05:00
commit 88d26dbecf
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/InlineButton.qml
View File

@ -46,7 +46,6 @@ Item {
property bool isFontAwesomeIcon: fontFamily == FontAwesome.fontFamily || fontFamily == FontAwesome.fontFamilySolid
property alias buttonColor: rect.color
Layout.rightMargin: isFontAwesomeIcon ? 0 : 4
height: isFontAwesomeIcon ? 30 : 24
width: isFontAwesomeIcon ? height : inlineText.width + 16

11
components/LineEditMulti.qml
View File

@ -44,7 +44,7 @@ ColumnLayout {
property alias placeholderText: placeholderLabel.text
property int inputPaddingLeft: 10
property alias inputPaddingRight: input.rightPadding
property int inputPaddingRight: 10
property int inputPaddingTop: 10
property int inputPaddingBottom: 10
property int inputRadius: 4
@ -75,6 +75,7 @@ ColumnLayout {
property bool labelButtonVisible: false
property string fontColor: MoneroComponents.Style.defaultFontColor
property string fontFamily: MoneroComponents.Style.fontRegular.name
property bool fontBold: false
property int fontSize: 16
@ -158,16 +159,18 @@ ColumnLayout {
id: input
readOnly: false
addressValidation: false
KeyNavigation.backtab: item.KeyNavigation.backtab
KeyNavigation.priority: KeyNavigation.BeforeItem
KeyNavigation.tab: item.KeyNavigation.tab
Layout.fillWidth: true
leftPadding: item.inputPaddingLeft
rightPadding: inlineButtons.width + 14
rightPadding: (inlineButtons.width > 0 ? inlineButtons.width + inlineButtons.spacing : 0) + inputPaddingRight
topPadding: item.inputPaddingTop
bottomPadding: item.inputPaddingBottom
wrapMode: item.wrapMode
font.family: item.fontFamily
fontSize: item.fontSize
fontBold: item.fontBold
fontColor: item.fontColor
@ -201,9 +204,9 @@ ColumnLayout {
RowLayout {
id: inlineButtons
anchors.top: parent.top
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.margins: 4
anchors.rightMargin: inputPaddingRight
spacing: 4
}
}