Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

HiFi glyphs font file update with fixed up/down carats

Browse source 
Update QML and HTML spinboxes accordingly.
This commit is contained in:
David Rowe 2016-05-18 13:25:11 +12:00
parent e0483585b8
commit 17d41dd7b9
4 changed files with 8 additions and 8 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.

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

@ -56,7 +56,7 @@ SpinBox {
incrementControl: HiFiGlyphs { incrementControl: HiFiGlyphs {
id: incrementButton id: incrementButton
text: hifi.glyphs.caratUp text: hifi.glyphs.caratUp
x: 6 x: 10
y: 1 y: 1
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
@ -64,8 +64,8 @@ SpinBox {
decrementControl: HiFiGlyphs { decrementControl: HiFiGlyphs {
text: hifi.glyphs.caratDn text: hifi.glyphs.caratDn
x: 6 x: 10
y: -3 y: -1
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/styles-uit/HifiConstants.qml
View file

@ -141,7 +141,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: 42 readonly property real spinnerSize: 50
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 real tableHeaderHeight: 29 readonly property real tableHeaderHeight: 29

8
scripts/system/html/edit-style.css
View file

@ -268,7 +268,7 @@ input[type=number]::-webkit-inner-spin-button {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
font-family: hifi-glyphs; font-family: hifi-glyphs;
font-size: 50px; font-size: 46px;
color: #afafaf; color: #afafaf;
cursor: pointer; cursor: pointer;
/*background-color: #000000;*/ /*background-color: #000000;*/
@ -276,17 +276,17 @@ input[type=number]::-webkit-inner-spin-button {
input[type=number]::-webkit-inner-spin-button:before, input[type=number]::-webkit-inner-spin-button:before,
input[type=number]::-webkit-inner-spin-button:after { input[type=number]::-webkit-inner-spin-button:after {
position:absolute; position:absolute;
left: -21px; left: -19px;
line-height: 8px; line-height: 8px;
text-align: center; text-align: center;
} }
input[type=number]::-webkit-inner-spin-button:before { input[type=number]::-webkit-inner-spin-button:before {
content: "6"; content: "6";
top: 5px; top: 4px;
} }
input[type=number]::-webkit-inner-spin-button:after { input[type=number]::-webkit-inner-spin-button:after {
content: "5"; content: "5";
bottom: 6px; bottom: 4px;
} }
input[type=number].hover-up::-webkit-inner-spin-button:before, input[type=number].hover-up::-webkit-inner-spin-button:before,