Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 00:16:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to new HiFi-Glyphs font file

Browse source
This commit is contained in:
David Rowe 2016-03-02 13:10:52 +13:00
parent d1f4369a5f
commit 20bf07550a
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/fonts/hifi-glyphs.ttf
View file

Binary file not shown.

9
interface/resources/qml/controls-uit/ComboBox.qml
View file

@ -57,15 +57,14 @@ ComboBox {
} }
HiFiGlyphs { HiFiGlyphs {
text: hifi.glyphs.backward // Adapt backward triangle to be downward triangle text: hifi.glyphs.caratDn
rotation: -90
y: -2
size: hifi.dimensions.spinnerSize size: hifi.dimensions.spinnerSize
color: pressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.baseGray color: pressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.baseGray
anchors { anchors {
top: parent.top
topMargin: -8
right: parent.right right: parent.right
rightMargin: 3 rightMargin: -6
verticalCenter: parent.verticalCenter
} }
} }

10
interface/resources/qml/controls-uit/SpinBox.qml
View file

@ -51,17 +51,17 @@ SpinBox {
incrementControl: HiFiGlyphs { incrementControl: HiFiGlyphs {
id: incrementButton id: incrementButton
text: hifi.glyphs.forward // Adapt forward triangle to be upward triangle text: hifi.glyphs.caratUp
rotation: -90 x: 6
y: 2 y: 2
size: hifi.dimensions.spinnerSize size: hifi.dimensions.spinnerSize
color: styleData.upPressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray color: styleData.upPressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray
} }
decrementControl: HiFiGlyphs { decrementControl: HiFiGlyphs {
text: hifi.glyphs.backward // Adapt backward triangle to be downward triangle text: hifi.glyphs.caratDn
rotation: -90 x: 6
y: -2 y: -3
size: hifi.dimensions.spinnerSize size: hifi.dimensions.spinnerSize
color: styleData.downPressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray color: styleData.downPressed ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray
} }

2
interface/resources/qml/controls-uit/Tree.qml
View file

@ -55,7 +55,7 @@ TreeView {
alternateBackgroundColor: parent.isLightColorScheme ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd alternateBackgroundColor: parent.isLightColorScheme ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd
branchDelegate: HiFiGlyphs { 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 size: hifi.fontSizes.tableText * 2.5
color: colorScheme == hifi.colorSchemes.light color: colorScheme == hifi.colorSchemes.light
? (styleData.selected ? (styleData.selected

5
interface/resources/qml/styles-uit/HifiConstants.qml
View file

@ -101,7 +101,7 @@ Item {
readonly property real textPadding: 8 readonly property real textPadding: 8
readonly property real sliderHandleSize: 18 readonly property real sliderHandleSize: 18
readonly property real sliderGrooveHeight: 8 readonly property real sliderGrooveHeight: 8
readonly property real spinnerSize: 20 readonly property real spinnerSize: 42
readonly property real tablePadding: 12 readonly property real tablePadding: 12
readonly property real tableRowHeight: largeScreen ? 26 : 23 readonly property real tableRowHeight: largeScreen ? 26 : 23
readonly property vector2d modalDialogMargin: Qt.vector2d(50, 30) readonly property vector2d modalDialogMargin: Qt.vector2d(50, 30)
@ -130,6 +130,9 @@ Item {
Item { Item {
id: glyphs id: glyphs
readonly property string backward: "E" 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 close: "w"
readonly property string closeInverted: "x" readonly property string closeInverted: "x"
readonly property string closeSmall: "C" readonly property string closeSmall: "C"