From 50eafab5dc84487ac8ff4c962a96d1d3ecfdbc84 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Thu, 16 Nov 2017 19:00:47 +0100 Subject: [PATCH] Have the menu buttons make use of the new font --- components/MenuButton.qml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/MenuButton.qml b/components/MenuButton.qml index 600bcd51..928848a6 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -60,6 +60,15 @@ Rectangle { property bool present: !under || under.checked || checked || under.numSelectedChildren > 0 height: present ? ((appWindow.height >= 800) ? 44 * scaleRatio : 52 * scaleRatio ) : 0 + // Load custom fonts @TODO: should probably do this somewhere else + Text { + FontLoader { id: sfuid; source: "../fonts/SFUIDisplay-Bold.otf"; } + FontLoader { source: "../fonts/SFUIDisplay-Medium.otf"; } + FontLoader { source: "../fonts/SFUIDisplay-Light.otf"; } + FontLoader { source: "../fonts/SFUIDisplay-Regular.otf"; } + font.family: "SFUIDisplay"; + } + // Button gradient whilst checked // @TODO: replace by .png - gradient not available in 2d renderer LinearGradient { @@ -106,7 +115,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right anchors.leftMargin: 8 * scaleRatio - font.family: "Arial" + font.family: "SFUIDisplay" font.bold: true font.pixelSize: 16 * scaleRatio color: "#FFFFFF"