From ba4d6993b78a3a0e7c0d0b0f09ab071b1bb5e447 Mon Sep 17 00:00:00 2001 From: xiphon Date: Thu, 24 Dec 2020 08:05:14 +0000 Subject: LineEdit: fix padding, fix inline buttons layout, multiple btns support --- components/LineEditMulti.qml | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'components/LineEditMulti.qml') diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index 4e971285..7f2e377e 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -36,13 +36,15 @@ ColumnLayout { Layout.fillWidth: true + default property alias content: inlineButtons.children + property alias text: input.text property alias labelText: inputLabel.text property alias labelButtonText: labelButton.text property alias placeholderText: placeholderLabel.text property int inputPaddingLeft: 10 - property int inputPaddingRight: 10 + property alias inputPaddingRight: input.rightPadding property int inputPaddingTop: 10 property int inputPaddingBottom: 10 property int inputRadius: 4 @@ -85,11 +87,6 @@ ColumnLayout { property alias addressValidation: input.addressValidation property string backgroundColor: "" // mock - property alias inlineButton: inlineButtonId - property bool inlineButtonVisible: false - property alias inlineButton2: inlineButton2Id - property bool inlineButton2Visible: false - signal labelButtonClicked(); signal inputLabelLinkActivated(); signal editingFinished(); @@ -166,7 +163,7 @@ ColumnLayout { Layout.fillWidth: true leftPadding: item.inputPaddingLeft - rightPadding: item.inputPaddingRight + rightPadding: inlineButtons.width + 14 topPadding: item.inputPaddingTop bottomPadding: item.inputPaddingBottom @@ -202,18 +199,12 @@ ColumnLayout { visible: !item.borderDisabled } - MoneroComponents.InlineButton { - id: inlineButtonId - visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false - anchors.right: parent.right - anchors.rightMargin: 8 - } - - MoneroComponents.InlineButton { - id: inlineButton2Id - visible: (inlineButton2Id.text || inlineButton2Id.icon) && inlineButton2Visible ? true : false + RowLayout { + id: inlineButtons + anchors.top: parent.top anchors.right: parent.right - anchors.rightMargin: inlineButtonVisible ? 48 : 8 + anchors.margins: 4 + spacing: 4 } } } -- cgit v1.2.3