Reset Window changes

This commit is contained in:
Atlante45 2016-03-08 10:23:37 -08:00
parent 320bd2b4d4
commit 51be88d4c3

View file

@ -52,9 +52,6 @@ Fadable {
// property bool pinned: false // property bool pinned: false
property bool resizable: false property bool resizable: false
property int colorScheme: hifi.colorSchemes.dark
readonly property int isLightScheme: colorScheme == hifi.colorSchemes.light
property vector2d minSize: Qt.vector2d(100, 100) property vector2d minSize: Qt.vector2d(100, 100)
property vector2d maxSize: Qt.vector2d(1280, 720) property vector2d maxSize: Qt.vector2d(1280, 720)
@ -140,7 +137,7 @@ Fadable {
id: contentBackground id: contentBackground
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: parent.isScrolling ? 11 : 0 anchors.rightMargin: parent.isScrolling ? 11 : 0
color: isLightScheme ? hifi.colors.backgroundLight : hifi.colors.backgroundDark color: hifi.colors.baseGray
visible: modality != Qt.ApplicationModal visible: modality != Qt.ApplicationModal
} }
@ -220,7 +217,7 @@ Fadable {
} }
width: parent.contentWidth width: parent.contentWidth
height: footer.height + 2 * hifi.dimensions.contentSpacing.y height: footer.height + 2 * hifi.dimensions.contentSpacing.y
color: isLightScheme ? hifi.colors.backgroundLight : hifi.colors.backgroundDark color: hifi.colors.baseGray
visible: footer.height > 0 visible: footer.height > 0
Item { Item {