From 7b7996dc66b65bf8e42315da13aa188c6a927282 Mon Sep 17 00:00:00 2001
From: mmbyday <mmbyday@protonmail.com>
Date: Mon, 22 Apr 2019 19:21:01 -0700
Subject: qrcodescanner: update icon with font awesome

---
 components/InlineButton.qml  | 8 +++++---
 components/LineEditMulti.qml | 5 ++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'components')

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
         }
     }
 }
-- 
cgit v1.2.3