Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

QtObject dousnt support inner instances

Browse source
This commit is contained in:
vladest 2018-03-10 16:18:32 +01:00
parent d6a42a9a49
commit 7ca0c76b1c
1 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,14 +12,6 @@ import QtQuick 2.5
import QtQuick.Window 2.2 import QtQuick.Window 2.2
QtObject { 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.
@ -46,9 +38,7 @@ QtObject {
return glyph; return glyph;
} }
QtObject { 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 @@ QtObject {
readonly property color tabBackgroundLight: "#d4d4d4" readonly property color tabBackgroundLight: "#d4d4d4"
} }
QtObject { 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
} }
QtObject { 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 @@ QtObject {
readonly property real buttonWidth: 120 readonly property real buttonWidth: 120
} }
QtObject { 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 @@ QtObject {
readonly property real disclosureButton: dimensions.largeScreen ? 30 : 22 readonly property real disclosureButton: dimensions.largeScreen ? 30 : 22
} }
QtObject { 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 @@ QtObject {
readonly property int placemark: 5 readonly property int placemark: 5
} }
QtObject { 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 @@ QtObject {
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
} }
QtObject {
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"