fontawesome: fix regular/solid font style

5 files changed, 15 insertions, 6 deletions

diff --git a/components/Label.qml b/components/Label.qml
index bc9ecd34..8437dbf6 100644
--- a/components/Label.qml
+++ b/components/Label.qml
@@ -45,6 +45,7 @@ Item {
     property alias horizontalAlignment: label.horizontalAlignment
     property alias elide: label.elide
     property alias textWidth: label.width
+    property alias styleName: label.font.styleName
     property alias themeTransition: label.themeTransition
     signal linkActivated()
     height: label.height
diff --git a/components/TitleBar.qml b/components/TitleBar.qml
index 272a3b88..6cc5d9cc 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -107,7 +107,7 @@ Rectangle {
                 image: MoneroComponents.Style.titleBarExpandSource
                 color: MoneroComponents.Style.defaultFontColor
                 fontAwesomeFallbackIcon: FontAwesome.cube
-                fontAwesomeFallbackSize: 14
+                fontAwesomeFallbackSize: 16
                 fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.9
                 opacity: 0.75
             }
@@ -131,9 +131,10 @@ Rectangle {
 
             Text {
                 text: FontAwesome.globe
-                font.family: FontAwesome.fontFamily
+                font.family: FontAwesome.fontFamilySolid
                 font.pixelSize: 16
                 color: MoneroComponents.Style.defaultFontColor
+                font.styleName: "Solid"
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.horizontalCenter: parent.horizontalCenter
                 opacity: 0.75
@@ -158,6 +159,7 @@ Rectangle {
             Text {
                 text: FontAwesome.moonO
                 font.family: MoneroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily
+                font.styleName: MoneroComponents.Style.blackTheme ? "Solid" : "Regular"
                 font.pixelSize: 16
                 color: MoneroComponents.Style.defaultFontColor
                 anchors.verticalCenter: parent.verticalCenter
diff --git a/components/effects/ImageMask.qml b/components/effects/ImageMask.qml
index df24f738..4ac751ff 100644
--- a/components/effects/ImageMask.qml
+++ b/components/effects/ImageMask.qml
@@ -41,6 +41,8 @@ Item {
     property string color: ""
     property bool fontAwesomeFallbackEnabled: true
     property var fontAwesomeFallbackIcon: ""
+    property string fontAwesomeFallbackFont: FontAwesome.fontFamilySolid
+    property string fontAwesomeFallbackStyle: "Solid"
     property int fontAwesomeFallbackSize: 16
     property double fontAwesomeFallbackOpacity: 0.8
     property string fontAwesomeFallbackColor: MoneroComponents.Style.defaultFontColor
@@ -74,8 +76,9 @@ Item {
         id: fontAwesomeFallback
         visible: !isOpenGL && root.fontAwesomeFallback
         text: !isOpenGL ? root.fontAwesomeFallbackIcon : ""
-        font.family: FontAwesome.fontFamily
+        font.family: root.fontAwesomeFallbackFont
         font.pixelSize: root.fontAwesomeFallbackSize
+        font.styleName: root.fontAwesomeFallbackStyle
         color: root.fontAwesomeFallbackColor
         anchors.verticalCenter: parent.verticalCenter
         anchors.horizontalCenter: parent.horizontalCenter
diff --git a/fonts/FontAwesome/FontAwesome.qml b/fonts/FontAwesome/FontAwesome.qml
index 7e5f6d04..b163fd6c 100644
--- a/fonts/FontAwesome/FontAwesome.qml
+++ b/fonts/FontAwesome/FontAwesome.qml
@@ -4,6 +4,7 @@ import QtQuick 2.9
 Object {
 
     FontLoader {
+        id: regular
         source: "./fa-regular-400.ttf"
     }
 
@@ -17,7 +18,7 @@ Object {
         source: "./fa-solid-900.ttf"
     }
 
-    property string fontFamily: "FontAwesome"
+    property string fontFamily: regular.name
     property string fontFamilyBrands: brands.name
     property string fontFamilySolid: solid.name
 
diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
index 82557134..d4d08140 100644
--- a/pages/settings/SettingsNode.qml
+++ b/pages/settings/SettingsNode.qml
@@ -99,9 +99,10 @@ Rectangle{
                     MoneroComponents.Label {
                         fontSize: 32
                         text: FontAwesome.home
-                        fontFamily: FontAwesome.fontFamily
+                        fontFamily: FontAwesome.fontFamilySolid
                         anchors.centerIn: parent
                         fontColor: MoneroComponents.Style.defaultFontColor
+                        styleName: "Solid"
                     }
                 }
 
@@ -200,7 +201,8 @@ Rectangle{
                     MoneroComponents.Label {
                         fontSize: 28
                         text: FontAwesome.cloud
-                        fontFamily: FontAwesome.fontFamily
+                        fontFamily: FontAwesome.fontFamilySolid
+                        styleName: "Solid"
                         anchors.centerIn: parent
                         fontColor: MoneroComponents.Style.defaultFontColor
                     }