From ec1cb72dd595dc344e3ec9a6ac7b3b86717398ef Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 2 Jun 2015 14:48:11 -0700
Subject: [PATCH] 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 {