diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-03-05 13:58:28 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-03-05 13:58:28 -0500 |
| commit | 88d26dbecf36fdab7d6150ddd87f18eabb69fa86 (patch) | |
| tree | f62b2ff4d828c270bc6380620538a66eb200f762 /components | |
| parent | 059af2bb49853384360219c2da4e220799371f67 (diff) | |
| parent | 2bb1092472c2dbc618b4ba3f1c109c3c8d8ab7c0 (diff) | |
| download | monzero-gui-88d26dbecf36fdab7d6150ddd87f18eabb69fa86.tar.gz monzero-gui-88d26dbecf36fdab7d6150ddd87f18eabb69fa86.tar.xz monzero-gui-88d26dbecf36fdab7d6150ddd87f18eabb69fa86.zip | |
Merge pull request #3328
2bb1092 LineEditMulti: right padding, fontFamily, backtab, inline btns vcenter (xiphon)
Diffstat (limited to 'components')
| -rw-r--r-- | components/InlineButton.qml | 1 | ||||
| -rw-r--r-- | components/LineEditMulti.qml | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/components/InlineButton.qml b/components/InlineButton.qml index 107614d5..9d6cba06 100644 --- a/components/InlineButton.qml +++ b/components/InlineButton.qml @@ -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 diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index 7f2e377e..a33893c9 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -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 } } |