Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 08:26:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12618 from vladest/hificonstants_as_object

Browse source 
Hificonstants as object
This commit is contained in:
John Conklin II 2018-03-22 11:03:05 -07:00 committed by GitHub
commit b6920a503c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,44 +11,34 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Window 2.2 import QtQuick.Window 2.2
Item { QtObject {
readonly property alias colors: colors
readonly property alias colorSchemes: colorSchemes
readonly property alias dimensions: dimensions
readonly property alias fontSizes: fontSizes
readonly property alias glyphs: glyphs
readonly property alias icons: icons
readonly property alias buttons: buttons
readonly property alias effects: effects
function glyphForIcon(icon) { function glyphForIcon(icon) {
// Translates icon enum to glyph char. // Translates icon enum to glyph char.
var glyph; var glyph;
switch (icon) { switch (icon) {
case hifi.icons.information: case icons.information:
glyph = hifi.glyphs.info; glyph = glyphs.info;
break; break;
case hifi.icons.question: case icons.question:
glyph = hifi.glyphs.question; glyph = glyphs.question;
break; break;
case hifi.icons.warning: case icons.warning:
glyph = hifi.glyphs.alert; glyph = glyphs.alert;
break; break;
case hifi.icons.critical: case icons.critical:
glyph = hifi.glyphs.error; glyph = glyphs.error;
break; break;
case hifi.icons.placemark: case icons.placemark:
glyph = hifi.glyphs.placemark; glyph = glyphs.placemark;
break; break;
default: default:
glyph = hifi.glyphs.noIcon; glyph = glyphs.noIcon;
} }
return glyph; return glyph;
} }
Item { readonly property QtObject colors: QtObject {
id: colors
// Base colors // Base colors
readonly property color baseGray: "#393939" readonly property color baseGray: "#393939"
readonly property color darkGray: "#121212" readonly property color darkGray: "#121212"
@ -134,15 +124,13 @@ Item {
readonly property color tabBackgroundLight: "#d4d4d4" readonly property color tabBackgroundLight: "#d4d4d4"
} }
Item { readonly property QtObject colorSchemes: QtObject {
id: colorSchemes
readonly property int light: 0 readonly property int light: 0
readonly property int dark: 1 readonly property int dark: 1
readonly property int faintGray: 2 readonly property int faintGray: 2
} }
Item { readonly property QtObject dimensions: QtObject {
id: dimensions
readonly property bool largeScreen: Screen.width >= 1920 && Screen.height >= 1080 readonly property bool largeScreen: Screen.width >= 1920 && Screen.height >= 1080
readonly property real borderRadius: largeScreen ? 7.5 : 5.0 readonly property real borderRadius: largeScreen ? 7.5 : 5.0
readonly property real borderWidth: largeScreen ? 2 : 1 readonly property real borderWidth: largeScreen ? 2 : 1
@ -168,8 +156,8 @@ Item {
readonly property real buttonWidth: 120 readonly property real buttonWidth: 120
} }
Item { readonly property QtObject fontSizes: QtObject {
id: fontSizes // In pixels // In pixels
readonly property real overlayTitle: dimensions.largeScreen ? 18 : 14 readonly property real overlayTitle: dimensions.largeScreen ? 18 : 14
readonly property real tabName: dimensions.largeScreen ? 12 : 10 readonly property real tabName: dimensions.largeScreen ? 12 : 10
readonly property real sectionName: dimensions.largeScreen ? 12 : 10 readonly property real sectionName: dimensions.largeScreen ? 12 : 10
@ -194,8 +182,7 @@ Item {
readonly property real disclosureButton: dimensions.largeScreen ? 30 : 22 readonly property real disclosureButton: dimensions.largeScreen ? 30 : 22
} }
Item { readonly property QtObject icons: QtObject {
id: icons
// Values per OffscreenUi::Icon // Values per OffscreenUi::Icon
readonly property int none: 0 readonly property int none: 0
readonly property int question: 1 readonly property int question: 1
@ -205,8 +192,7 @@ Item {
readonly property int placemark: 5 readonly property int placemark: 5
} }
Item { readonly property QtObject buttons: QtObject {
id: buttons
readonly property int white: 0 readonly property int white: 0
readonly property int blue: 1 readonly property int blue: 1
readonly property int red: 2 readonly property int red: 2
@ -227,12 +213,11 @@ Item {
readonly property int radius: 5 readonly property int radius: 5
} }
QtObject { readonly property QtObject effects: QtObject {
id: effects
readonly property int fadeInDuration: 300 readonly property int fadeInDuration: 300
} }
Item {
id: glyphs readonly property QtObject glyphs: QtObject {
readonly property string noIcon: "" readonly property string noIcon: ""
readonly property string hmd: "b" readonly property string hmd: "b"
readonly property string screen: "c" readonly property string screen: "c"