monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2375

Browse source 
6df9e58 fontawesome: fix regular/solid font style (selsta)
This commit is contained in:
luigi1111 2019-09-14 12:41:52 -05:00
commit a1e416ee83
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/Label.qml
View file

@ -45,6 +45,7 @@ Item {
property alias horizontalAlignment: label.horizontalAlignment property alias horizontalAlignment: label.horizontalAlignment
property alias elide: label.elide property alias elide: label.elide
property alias textWidth: label.width property alias textWidth: label.width
property alias styleName: label.font.styleName
property alias themeTransition: label.themeTransition property alias themeTransition: label.themeTransition
signal linkActivated() signal linkActivated()
height: label.height height: label.height

6
components/TitleBar.qml
View file

@ -107,7 +107,7 @@ Rectangle {
image: MoneroComponents.Style.titleBarExpandSource image: MoneroComponents.Style.titleBarExpandSource
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
fontAwesomeFallbackIcon: FontAwesome.cube fontAwesomeFallbackIcon: FontAwesome.cube
fontAwesomeFallbackSize: 14 fontAwesomeFallbackSize: 16
fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.9 fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.9
opacity: 0.75 opacity: 0.75
} }
@ -131,9 +131,10 @@ Rectangle {
Text { Text {
text: FontAwesome.globe text: FontAwesome.globe
font.family: FontAwesome.fontFamily font.family: FontAwesome.fontFamilySolid
font.pixelSize: 16 font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
opacity: 0.75 opacity: 0.75
@ -158,6 +159,7 @@ Rectangle {
Text { Text {
text: FontAwesome.moonO text: FontAwesome.moonO
font.family: MoneroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily font.family: MoneroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily
font.styleName: MoneroComponents.Style.blackTheme ? "Solid" : "Regular"
font.pixelSize: 16 font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

5
components/effects/ImageMask.qml
View file

@ -41,6 +41,8 @@ Item {
property string color: "" property string color: ""
property bool fontAwesomeFallbackEnabled: true property bool fontAwesomeFallbackEnabled: true
property var fontAwesomeFallbackIcon: "" property var fontAwesomeFallbackIcon: ""
property string fontAwesomeFallbackFont: FontAwesome.fontFamilySolid
property string fontAwesomeFallbackStyle: "Solid"
property int fontAwesomeFallbackSize: 16 property int fontAwesomeFallbackSize: 16
property double fontAwesomeFallbackOpacity: 0.8 property double fontAwesomeFallbackOpacity: 0.8
property string fontAwesomeFallbackColor: MoneroComponents.Style.defaultFontColor property string fontAwesomeFallbackColor: MoneroComponents.Style.defaultFontColor
@ -74,8 +76,9 @@ Item {
id: fontAwesomeFallback id: fontAwesomeFallback
visible: !isOpenGL && root.fontAwesomeFallback visible: !isOpenGL && root.fontAwesomeFallback
text: !isOpenGL ? root.fontAwesomeFallbackIcon : "" text: !isOpenGL ? root.fontAwesomeFallbackIcon : ""
font.family: FontAwesome.fontFamily font.family: root.fontAwesomeFallbackFont
font.pixelSize: root.fontAwesomeFallbackSize font.pixelSize: root.fontAwesomeFallbackSize
font.styleName: root.fontAwesomeFallbackStyle
color: root.fontAwesomeFallbackColor color: root.fontAwesomeFallbackColor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter

3
fonts/FontAwesome/FontAwesome.qml
View file

@ -4,6 +4,7 @@ import QtQuick 2.9
Object { Object {
FontLoader { FontLoader {
id: regular
source: "./fa-regular-400.ttf" source: "./fa-regular-400.ttf"
} }
@ -17,7 +18,7 @@ Object {
source: "./fa-solid-900.ttf" source: "./fa-solid-900.ttf"
} }
property string fontFamily: "FontAwesome" property string fontFamily: regular.name
property string fontFamilyBrands: brands.name property string fontFamilyBrands: brands.name
property string fontFamilySolid: solid.name property string fontFamilySolid: solid.name

6
pages/settings/SettingsNode.qml
View file

@ -99,9 +99,10 @@ Rectangle{
MoneroComponents.Label { MoneroComponents.Label {
fontSize: 32 fontSize: 32
text: FontAwesome.home text: FontAwesome.home
fontFamily: FontAwesome.fontFamily fontFamily: FontAwesome.fontFamilySolid
anchors.centerIn: parent anchors.centerIn: parent
fontColor: MoneroComponents.Style.defaultFontColor fontColor: MoneroComponents.Style.defaultFontColor
styleName: "Solid"
} }
} }
@ -200,7 +201,8 @@ Rectangle{
MoneroComponents.Label { MoneroComponents.Label {
fontSize: 28 fontSize: 28
text: FontAwesome.cloud text: FontAwesome.cloud
fontFamily: FontAwesome.fontFamily fontFamily: FontAwesome.fontFamilySolid
styleName: "Solid"
anchors.centerIn: parent anchors.centerIn: parent
fontColor: MoneroComponents.Style.defaultFontColor fontColor: MoneroComponents.Style.defaultFontColor
} }