diff options
| author | selsta <selsta@sent.at> | 2019-09-05 00:22:17 +0200 |
|---|---|---|
| committer | selsta <selsta@sent.at> | 2019-09-10 13:14:10 +0200 |
| commit | 6df9e584b38918eeb388a4a9e728408ca795089a (patch) | |
| tree | f93daf357e6adcb23dee34606b3ba52b68a5002c /components | |
| parent | a5b2d5e727c44d03c5f3f96d9726658caa9cdb6d (diff) | |
| download | monzero-gui-6df9e584b38918eeb388a4a9e728408ca795089a.tar.gz monzero-gui-6df9e584b38918eeb388a4a9e728408ca795089a.tar.xz monzero-gui-6df9e584b38918eeb388a4a9e728408ca795089a.zip | |
fontawesome: fix regular/solid font style
Diffstat (limited to 'components')
| -rw-r--r-- | components/Label.qml | 1 | ||||
| -rw-r--r-- | components/TitleBar.qml | 6 | ||||
| -rw-r--r-- | components/effects/ImageMask.qml | 5 |
3 files changed, 9 insertions, 3 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 |