diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf index 54a23dce07..3e8e5e5b90 100644 Binary files a/interface/resources/fonts/hifi-glyphs.ttf and b/interface/resources/fonts/hifi-glyphs.ttf differ 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"