From 20bf07550ac9ec9f79a9509e6c53f3f7d881a518 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 2 Mar 2016 13:10:52 +1300
Subject: [PATCH] Update to new HiFi-Glyphs font file

---
 interface/resources/fonts/hifi-glyphs.ttf     | Bin 17612 -> 18804 bytes
 .../resources/qml/controls-uit/ComboBox.qml   |   9 ++++-----
 .../resources/qml/controls-uit/SpinBox.qml    |  10 +++++-----
 interface/resources/qml/controls-uit/Tree.qml |   2 +-
 .../qml/styles-uit/HifiConstants.qml          |   5 ++++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 54a23dce075abfda7b37b2d00bcc5efc6b956245..3e8e5e5b908dc5d7535e90a290bc9ab477b87f02 100644
GIT binary patch
delta 3192
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

delta 1982
zcmZuy-EUK682`Qf+}iF7Mmx6g?Yd6#!ujqBj4|lO2I`t<3?ZnTweQ*!&KKvjuwhJh
z;}_AyP-2K)=oLY)OfZq?g~lr{yyC*dV3fZA6NQ9$A?7{p#!NU()8F&{p67X==l47(
zeRz%h{61-d0O-LQ!YIwnz4GG4fBrlU6u$y6da^h>hgHOY;zs~>FTQ+GTKw+Z_W(Hq
z;MKCFyPsYE^)(<=0?5Ov?z>N(APf}W1JG49SC``ld#?hK`#@o+#`H?;-iHo=-vDT}
z8f)s2gP|xu1_3-*v+64Y*OMuL@B%(Jow7c$JZu7yB7jdUeZ|EW<aK~d@`7yLVpi_W
zZ-A-CJjQkW`q%U4egvj(0g*p~<_OUH&g!Rc^c{JGWC;AZ`}@s8`!{s6aE(ln7g|Tj
z-_0=qIgDWo769ZihCG19&WE$%&UZA(3_L(MK%<D@E`Sue5JCjNeiU#PSDrixF5CkF
zGtfI$`{BYTuoD87035}17RNAy6DVR9bC|~hPC-Ti2XF|7aRgI1jgvUu3We3yO!(}s
zqtnM`P84V7<`+)!jB???p~FX}PM<v9&foerJQC}`d*NHHw<F%3T;@jRuc6}5FWX1A
z-x=OL{PFNlBU?t!jNBY~FshAy0Nhrh@6zTN#>hQ#4<`W<&*ZgCdIuSd?I(N3v(sce
zo=L~Kk)0w+UfV_T<MG(Oz2n@}4ihPp?jxD}cs9=s9vHBs#n?nwDw*h7OU9zz6O2uC
zM`Ovgu0%2!Sn*gi)L~Ekj}Ap+al&|XWV3&Fa&xXIc@{^ax9><Z@g|@8S_otf!%zXT
zFP)L4bkI>&Rr32{+XmBziKHpn=)S$#po{dj!MLocN_Icl8{=%2tj*?n`-XB8ne#)r
z?%7C5I4_h+|K9K0KAsyopPA?`MivEKD3yfS99bI~%L%#M&_G{0Aq<vE=Sx2Xc7K1*
zR)L!%w;vZCg>G9Xk|a6_3aRy0@%iv1m0DjGTYMj9Z#26_f!3@F6~sPKq*8_YWsfnN
z3gUn$(F<&K$<aMdQ$b9NGOg)$g_a$=?m4E(Jf8|;MpP+(?cADUGoM;Ux$WLBDzvIw
z%+)*bTSaZNBhT3sV`83%q{K<ua7`!hO^F3whvC+#ASNV%*4auMinQEVVpI@Ql0<#C
z#yoB$B$-}uYz~u>LQSJu<L*gGrI*<f<+UdzEx=OXo~Nv0aF=GcG)XPpyTIywQh`<s
zkCp3=x5~X_fm+ON@L*Y_Wz+Hb1%tBG!G?W_d3DB{>y~Be8eFw4vJ#+8WWTIZkNL(G
z7N}>kv@%I622a>%dW^Camy60{HR`cI1K-k3lMg}8cWzrh>5(Vtvg2KDPo-Bb&?UWm
zp<|{LVLgK&_9!B4*jA%mVp5UlI__0uY8kd+8O<xar(Q*&mcC+GyhcIHDC$#lQzJVS
zjaCdlDBNRosZp;x_S5orEBR;8WydsiH;`^X6W7P;*BzG%;?|}ntRHnc7sP&bWBOi$
zYuc|)t~=T6a&VBRHDlS}LNqKYh}%@HePB9OXG5x#s!;usUe`Uo-l|GnQ!g_<Z9Xzp
zrb|w9C7>i)b}Xx58+AVU0ac_`PhaYci*K7MP@m~uxkd$XyTTV`LxxQaZq=mqLN|6f
zp~<xDR05f`je7VRcIlqibT0d}#t{dX5*?tM^;jErl^x6VnD58hYZ6;F^(u7|Rc2S1
zXENXK4PHstG3+|?sMF(`4WIfK8@k7+6ZcJ{!aTog{UBl*_Jx#g8daN?ncccNPYGJW
S!VYq}_0qyfa^qj?X5l~NJNF*|

diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml
index dcac1264ec..81cf53a842 100644
--- a/interface/resources/qml/controls-uit/ComboBox.qml
+++ b/interface/resources/qml/controls-uit/ComboBox.qml
@@ -57,15 +57,14 @@ ComboBox {
             }
 
             HiFiGlyphs {
-                text: hifi.glyphs.backward  // Adapt backward triangle to be downward triangle
-                rotation: -90
-                y: -2
+                text: hifi.glyphs.caratDn
                 size: hifi.dimensions.spinnerSize
                 color: pressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.baseGray
                 anchors {
+                    top: parent.top
+                    topMargin: -8
                     right: parent.right
-                    rightMargin: 3
-                    verticalCenter: parent.verticalCenter
+                    rightMargin: -6
                 }
             }
 
diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml
index eacdd05857..d1061bca0b 100644
--- a/interface/resources/qml/controls-uit/SpinBox.qml
+++ b/interface/resources/qml/controls-uit/SpinBox.qml
@@ -51,17 +51,17 @@ SpinBox {
 
         incrementControl: HiFiGlyphs {
             id: incrementButton
-            text: hifi.glyphs.forward  // Adapt forward triangle to be upward triangle
-            rotation: -90
+            text: hifi.glyphs.caratUp
+            x: 6
             y: 2
             size: hifi.dimensions.spinnerSize
             color: styleData.upPressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray
         }
 
         decrementControl: HiFiGlyphs {
-            text: hifi.glyphs.backward  // Adapt backward triangle to be downward triangle
-            rotation: -90
-            y: -2
+            text: hifi.glyphs.caratDn
+            x: 6
+            y: -3
             size: hifi.dimensions.spinnerSize
             color: styleData.downPressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray
         }
diff --git a/interface/resources/qml/controls-uit/Tree.qml b/interface/resources/qml/controls-uit/Tree.qml
index 454218b116..086fa0d458 100644
--- a/interface/resources/qml/controls-uit/Tree.qml
+++ b/interface/resources/qml/controls-uit/Tree.qml
@@ -55,7 +55,7 @@ TreeView {
         alternateBackgroundColor: parent.isLightColorScheme ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd
 
         branchDelegate: HiFiGlyphs {
-            text: styleData.isExpanded ? hifi.glyphs.disclosureCollapse : hifi.glyphs.disclosureExpand
+            text: styleData.isExpanded ? hifi.glyphs.caratDn : hifi.glyphs.caratR
             size: hifi.fontSizes.tableText * 2.5
             color: colorScheme == hifi.colorSchemes.light
                    ? (styleData.selected
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 5e377d9e91..f13550b67d 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -101,7 +101,7 @@ Item {
         readonly property real textPadding: 8
         readonly property real sliderHandleSize: 18
         readonly property real sliderGrooveHeight: 8
-        readonly property real spinnerSize: 20
+        readonly property real spinnerSize: 42
         readonly property real tablePadding: 12
         readonly property real tableRowHeight: largeScreen ? 26 : 23
         readonly property vector2d modalDialogMargin: Qt.vector2d(50, 30)
@@ -130,6 +130,9 @@ Item {
     Item {
         id: glyphs
         readonly property string backward: "E"
+        readonly property string caratDn: "5"
+        readonly property string caratR: "3"
+        readonly property string caratUp: "6"
         readonly property string close: "w"
         readonly property string closeInverted: "x"
         readonly property string closeSmall: "C"