From 6fa805df621e4dbc1ecf5f6d03cd5469421ead2e Mon Sep 17 00:00:00 2001 From: mmbyday Date: Wed, 12 Dec 2018 13:31:24 -0800 Subject: qrscanner: update addressbook and transfer UI --- components/InlineButton.qml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'components/InlineButton.qml') diff --git a/components/InlineButton.qml b/components/InlineButton.qml index cdbcd2ef..7bd1f7d2 100644 --- a/components/InlineButton.qml +++ b/components/InlineButton.qml @@ -42,6 +42,7 @@ Item { property string textColor: "#FFFFFF" property int fontSize: 12 * scaleRatio property alias text: inlineText.text + property alias buttonColor: rect.color signal clicked() function doClick() { @@ -55,7 +56,7 @@ Item { color: MoneroComponents.Style.buttonBackgroundColorDisabled border.color: "black" height: 28 * scaleRatio - width: inlineText.width + 22 * scaleRatio + width: inlineText.text ? (inlineText.width + 22) * scaleRatio : inlineButton.icon ? (inlineImage.width + 16) * scaleRatio : rect.height radius: 4 anchors.top: parent.top @@ -71,6 +72,13 @@ Item { anchors.horizontalCenter: parent.horizontalCenter } + Image { + id: inlineImage + visible: inlineButton.icon !== "" + anchors.centerIn: parent + source: inlineButton.icon + } + MouseArea { id: buttonArea cursorShape: rect.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor @@ -78,12 +86,12 @@ Item { anchors.fill: parent onClicked: doClick() onEntered: { - rect.color = "#707070"; + rect.color = buttonColor ? buttonColor : "#707070"; rect.opacity = 0.8; } onExited: { rect.opacity = 1.0; - rect.color = "#808080"; + rect.color = buttonColor ? buttonColor : "#808080"; } } } -- cgit v1.2.3