diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-17 22:09:18 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-17 22:09:18 -0500 |
| commit | 5fa64c34ec7541cdc82bf0e568d720c46d4c2686 (patch) | |
| tree | 990528d1e9476034e67238dae2e3464dbb478ad5 /components | |
| parent | 376421667a6432ca3d6a5dc606fa56f74c1a1051 (diff) | |
| parent | de6a9b6779f7d9ff2bb1eac93eea91adf271dd30 (diff) | |
| download | monzero-gui-5fa64c34ec7541cdc82bf0e568d720c46d4c2686.tar.gz monzero-gui-5fa64c34ec7541cdc82bf0e568d720c46d4c2686.tar.xz monzero-gui-5fa64c34ec7541cdc82bf0e568d720c46d4c2686.zip | |
Merge pull request #2831
de6a9b6 Transfer: address book inline button, 2nd inline button, scan QR code button fixes (rating89us)
Diffstat (limited to 'components')
| -rw-r--r-- | components/InlineButton.qml | 1 | ||||
| -rw-r--r-- | components/LineEditMulti.qml | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/components/InlineButton.qml b/components/InlineButton.qml index 402dade2..299f1ae6 100644 --- a/components/InlineButton.qml +++ b/components/InlineButton.qml @@ -53,6 +53,7 @@ Item { property alias fontPixelSize: inlineText.font.pixelSize property alias fontFamily: inlineText.font.family property alias buttonColor: rect.color + property alias buttonHeight: rect.height signal clicked() function doClick() { diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index 46052495..179d0438 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -87,6 +87,8 @@ ColumnLayout { property alias inlineButton: inlineButtonId property bool inlineButtonVisible: false + property alias inlineButton2: inlineButton2Id + property bool inlineButton2Visible: false signal labelButtonClicked(); signal inputLabelLinkActivated(); @@ -202,5 +204,12 @@ ColumnLayout { anchors.right: parent.right anchors.rightMargin: 8 } + + MoneroComponents.InlineButton { + id: inlineButton2Id + visible: (inlineButton2Id.text || inlineButton2Id.icon) && inlineButton2Visible ? true : false + anchors.right: parent.right + anchors.rightMargin: inlineButtonVisible ? 48 : 8 + } } } |