diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-23 15:34:24 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-23 15:34:24 -0500 |
| commit | 358e1d23facbd10fefbb2bf04c45b98f0c728ad0 (patch) | |
| tree | e6a4d56120b5353c3d138593469e4e01793a98fa /components | |
| parent | ba0f7fc9f62467d1b95ef40adf849c6e4484fccd (diff) | |
| parent | 7b7996dc66b65bf8e42315da13aa188c6a927282 (diff) | |
| download | monzero-gui-358e1d23facbd10fefbb2bf04c45b98f0c728ad0.tar.gz monzero-gui-358e1d23facbd10fefbb2bf04c45b98f0c728ad0.tar.xz monzero-gui-358e1d23facbd10fefbb2bf04c45b98f0c728ad0.zip | |
Merge pull request #2106
7b7996d qrcodescanner: update icon with font awesome (mmbyday)
Diffstat (limited to 'components')
| -rw-r--r-- | components/InlineButton.qml | 8 | ||||
| -rw-r--r-- | components/LineEditMulti.qml | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/components/InlineButton.qml b/components/InlineButton.qml index e894e14d..4741a701 100644 --- a/components/InlineButton.qml +++ b/components/InlineButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2015, The Monero Project +// Copyright (c) 2014-2019, The Monero Project // // All rights reserved. // @@ -43,11 +43,13 @@ Item { property string pressedColor: "#FF4304" property string releasedColor: "#FF6C3C" property string icon: "" - property string textColor: "#FFFFFF" + property string textColor: "black" property int fontSize: small ? 14 * scaleRatio : 16 * scaleRatio property int rectHeight: small ? 24 * scaleRatio : 28 * scaleRatio property int rectHMargin: small ? 16 * scaleRatio : 22 * scaleRatio property alias text: inlineText.text + property alias fontPixelSize: inlineText.font.pixelSize + property alias fontFamily: inlineText.font property alias buttonColor: rect.color signal clicked() @@ -73,7 +75,7 @@ Item { font.family: MoneroComponents.Style.fontBold.name font.bold: true font.pixelSize: inlineButton.fontSize - color: "black" + color: inlineButton.textColor anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter } diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index e28d9e75..3689ad39 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2015, The Monero Project +// Copyright (c) 2014-2019, The Monero Project // // All rights reserved. // @@ -201,8 +201,7 @@ ColumnLayout { visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false anchors.right: parent.right anchors.rightMargin: 8 * scaleRatio - anchors.top: parent.top - anchors.topMargin: 4 * scaleRatio + anchors.verticalCenter: parent.verticalCenter } } } |