From a8a3c677ade9f20934889383947c18170153860d Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 2 Jun 2015 12:00:57 -0700 Subject: [PATCH 1/3] Darken address bar hint text so that it's better visible on the DK2 --- interface/resources/qml/styles/HifiConstants.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/styles/HifiConstants.qml b/interface/resources/qml/styles/HifiConstants.qml index 702a396afb..5b2a475699 100644 --- a/interface/resources/qml/styles/HifiConstants.qml +++ b/interface/resources/qml/styles/HifiConstants.qml @@ -18,7 +18,7 @@ Item { readonly property color background: sysPalette.dark readonly property color text: sysPalette.text readonly property color disabledText: "gray" - readonly property color hintText: sysPalette.dark + readonly property color hintText: "gray" // A bit darker than sysPalette.dark so that it is visible on the DK2 readonly property color light: sysPalette.light readonly property alias activeWindow: activeWindow readonly property alias inactiveWindow: inactiveWindow From ec1cb72dd595dc344e3ec9a6ac7b3b86717398ef Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 2 Jun 2015 14:48:11 -0700 Subject: [PATCH 2/3] Rework QML font sizing to be more consistent across platforms --- interface/resources/qml/AddressBarDialog.qml | 1 - interface/resources/qml/controls/SpinBox.qml | 2 +- interface/resources/qml/controls/Text.qml | 2 +- interface/resources/qml/controls/TextArea.qml | 2 +- interface/resources/qml/controls/TextEdit.qml | 2 +- interface/resources/qml/controls/TextHeader.qml | 2 +- interface/resources/qml/controls/TextInput.qml | 4 ++-- interface/resources/qml/styles/HifiConstants.qml | 6 +++--- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 3893c26f3c..f38a740b22 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -58,7 +58,6 @@ Item { } - font.pointSize: 15 helperText: "Go to: place, @user, /path, network address" onAccepted: { diff --git a/interface/resources/qml/controls/SpinBox.qml b/interface/resources/qml/controls/SpinBox.qml index 7e44b9e4a3..1acba57409 100644 --- a/interface/resources/qml/controls/SpinBox.qml +++ b/interface/resources/qml/controls/SpinBox.qml @@ -9,7 +9,7 @@ Original.SpinBox { style: SpinBoxStyle { HifiConstants { id: hifi } font.family: hifi.fonts.fontFamily - font.pointSize: hifi.fonts.fontSize + font.pixelSize: hifi.fonts.pixelSize } } diff --git a/interface/resources/qml/controls/Text.qml b/interface/resources/qml/controls/Text.qml index 4f82f2d9e4..b7bd90d257 100644 --- a/interface/resources/qml/controls/Text.qml +++ b/interface/resources/qml/controls/Text.qml @@ -4,6 +4,6 @@ import "../styles" Original.Text { HifiConstants { id: hifi } font.family: hifi.fonts.fontFamily - font.pointSize: hifi.fonts.fontSize + font.pixelSize: hifi.fonts.pixelSize } diff --git a/interface/resources/qml/controls/TextArea.qml b/interface/resources/qml/controls/TextArea.qml index a86e76620a..6d8978c210 100644 --- a/interface/resources/qml/controls/TextArea.qml +++ b/interface/resources/qml/controls/TextArea.qml @@ -4,6 +4,6 @@ import "../styles" Original.TextArea { HifiConstants { id: hifi } font.family: hifi.fonts.fontFamily - font.pointSize: hifi.fonts.fontSize + font.pixelSize: hifi.fonts.pixelSize } diff --git a/interface/resources/qml/controls/TextEdit.qml b/interface/resources/qml/controls/TextEdit.qml index b59b20a3d6..4999c2bf5b 100644 --- a/interface/resources/qml/controls/TextEdit.qml +++ b/interface/resources/qml/controls/TextEdit.qml @@ -4,6 +4,6 @@ import "../styles" Original.TextEdit { HifiConstants { id: hifi } font.family: hifi.fonts.fontFamily - font.pointSize: hifi.fonts.fontSize + font.pixelSize: hifi.fonts.pixelSize } diff --git a/interface/resources/qml/controls/TextHeader.qml b/interface/resources/qml/controls/TextHeader.qml index 9ce1da4ac2..c52553331b 100644 --- a/interface/resources/qml/controls/TextHeader.qml +++ b/interface/resources/qml/controls/TextHeader.qml @@ -4,6 +4,6 @@ import "../styles" Text { HifiConstants { id: hifi } color: hifi.colors.hifiBlue - font.pointSize: hifi.fonts.headerPointSize + font.pixelSize: hifi.fonts.headerPixelSize font.bold: true } diff --git a/interface/resources/qml/controls/TextInput.qml b/interface/resources/qml/controls/TextInput.qml index d533c67bd6..b7ca6d2c1b 100644 --- a/interface/resources/qml/controls/TextInput.qml +++ b/interface/resources/qml/controls/TextInput.qml @@ -11,7 +11,7 @@ Original.TextInput { color: hifi.colors.text verticalAlignment: Original.TextInput.AlignVCenter font.family: hifi.fonts.fontFamily - font.pointSize: hifi.fonts.fontSize + font.pixelSize: hifi.fonts.pixelSize /* Original.Rectangle { @@ -23,7 +23,7 @@ Original.TextInput { */ Text { anchors.fill: parent - font.pointSize: parent.font.pointSize + font.pixelSize: parent.font.pixelSize font.family: parent.font.family verticalAlignment: parent.verticalAlignment horizontalAlignment: parent.horizontalAlignment diff --git a/interface/resources/qml/styles/HifiConstants.qml b/interface/resources/qml/styles/HifiConstants.qml index 5b2a475699..fa556f2083 100644 --- a/interface/resources/qml/styles/HifiConstants.qml +++ b/interface/resources/qml/styles/HifiConstants.qml @@ -36,9 +36,9 @@ Item { QtObject { id: fonts - readonly property real headerPointSize: 24 - readonly property string fontFamily: "Helvetica" - readonly property real fontSize: 18 + readonly property string fontFamily: "Arial" // Available on both Windows and OSX + readonly property real pixelSize: 22 // Logical pixel size; works on Windows and OSX at varying physical DPIs + readonly property real headerPixelSize: 32 } QtObject { From 878227ab8b729f9413989492bdc8b7c74a0a6520 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 2 Jun 2015 16:33:09 -0700 Subject: [PATCH 3/3] Increase address bar dialog size Including font size, just for this dialog. --- interface/resources/qml/AddressBarDialog.qml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index f38a740b22..91e05d020d 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -22,6 +22,7 @@ Item { property int animationDuration: hifi.effects.fadeInDuration property bool destroyOnInvisible: false + property real scale: 1.25 // Make this dialog a little larger than normal implicitWidth: addressBarDialog.implicitWidth implicitHeight: addressBarDialog.implicitHeight @@ -41,9 +42,9 @@ Item { id: backgroundImage source: "../images/address-bar.svg" - width: 576 - height: 80 - property int inputAreaHeight: 56 // Height of the background's input area + width: 576 * root.scale + height: 80 * root.scale + property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area property int inputAreaStep: (height - inputAreaHeight) / 2 TextInput { @@ -58,6 +59,8 @@ Item { } + font.pixelSize: hifi.fonts.pixelSize * root.scale + helperText: "Go to: place, @user, /path, network address" onAccepted: {