From a8cb3f153fbee0ef59e3e0d4f7bf627d1604eaa2 Mon Sep 17 00:00:00 2001 From: Nedim Hadzic Date: Thu, 12 Jan 2017 22:51:11 +0100 Subject: [PATCH] Use virtual keyboard default font Change-Id: I9d3fc8e519da66c8d03127978560a685ae8ea58f --- .../VirtualKeyboard/Styles/neptune/style.qml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml b/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml index 84717b0..1efcdff 100644 --- a/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml +++ b/imports/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml @@ -85,7 +85,7 @@ KeyboardStyle { anchors.top: parent.top anchors.margins: keyContentMargin / 3 font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 38 * scaleHint capitalization: control.uppercased ? Font.AllUppercase : Font.MixedCase @@ -103,7 +103,7 @@ KeyboardStyle { anchors.rightMargin: keyContentMargin anchors.bottomMargin: control.smallTextVisible ? keyContentMargin * 0.8 : keyContentMargin font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 52 * scaleHint capitalization: control.uppercased ? Font.AllUppercase : Font.MixedCase @@ -258,7 +258,7 @@ KeyboardStyle { verticalAlignment: Text.AlignVCenter color: "#80c342" font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 44 * scaleHint capitalization: Font.AllUppercase @@ -430,7 +430,7 @@ KeyboardStyle { Behavior on color { PropertyAnimation { duration: 250 } } anchors.centerIn: parent font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 48 * scaleHint } @@ -473,7 +473,7 @@ KeyboardStyle { anchors.fill: parent anchors.margins: keyContentMargin font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 44 * scaleHint capitalization: Font.AllUppercase @@ -525,7 +525,7 @@ KeyboardStyle { anchors.fill: parent anchors.margins: keyContentMargin font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 44 * scaleHint capitalization: Font.AllUppercase @@ -638,7 +638,7 @@ KeyboardStyle { anchors.fill: parent anchors.margins: Math.round(48 * scaleHint) font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 82 * scaleHint } @@ -657,7 +657,7 @@ KeyboardStyle { text: model.text color: "#868482" font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 52 * scaleHint } @@ -693,7 +693,7 @@ KeyboardStyle { text: decorateText(display, wordCompletionLength) color: "#BC6608" font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 44 * scaleHint } @@ -756,7 +756,7 @@ KeyboardStyle { anchors.top: parent.top anchors.margins: keyContentMargin font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: 44 * scaleHint capitalization: { @@ -835,7 +835,7 @@ KeyboardStyle { text: decorateText(display, wordCompletionLength) color: "#5CAA15" font { - family: fontFamily + //family: fontFamily weight: Utils.Style.fontWeight pixelSize: Qt.inputMethod.cursorRectangle.height * 0.8 } -- 2.10.1 (Apple Git-78)