git.iko.soy/unity8
on xenial help sign in
color palette fixes
commit064b28f4645ee515983df8472e3d0385e1bc568f authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 30 Mar 2016, 00:10 (11 years ago) parentc477c78
2 files changed+13−13
compare with xenial
unifiedsplit
tests/qmltests/Stages/SurfaceManagerControls.qml+7−8 tests/qmltests/Stages/tst_DesktopStage.qml+6−5
tests/qmltests/Stages/SurfaceManagerControls.qml+7−8
@@ -20,14 +20,13 @@ import Unity.Application 0.1
2020
2121Column {
2222 id: root
23− property color textColor: "black"
2423
25− Label {text: "Size hints for new surface:"; color: root.textColor; font.bold: true}
24+ Label {text: "Size hints for new surface:"; font.bold: true}
2625
27− SurfaceManagerField { text: "min width"; propertyName: "newSurfaceMinimumWidth"; textColor: root.textColor }
28− SurfaceManagerField { text: "max width"; propertyName: "newSurfaceMaximumWidth"; textColor: root.textColor }
29− SurfaceManagerField { text: "min height"; propertyName: "newSurfaceMinimumHeight"; textColor: root.textColor }
30− SurfaceManagerField { text: "max height"; propertyName: "newSurfaceMaximumHeight"; textColor: root.textColor }
31− SurfaceManagerField { text: "width increment"; propertyName: "newSurfaceWidthIncrement"; textColor: root.textColor }
32− SurfaceManagerField { text: "height increment"; propertyName: "newSurfaceHeightIncrement"; textColor: root.textColor }
26+ SurfaceManagerField { text: "min width"; propertyName: "newSurfaceMinimumWidth" }
27+ SurfaceManagerField { text: "max width"; propertyName: "newSurfaceMaximumWidth" }
28+ SurfaceManagerField { text: "min height"; propertyName: "newSurfaceMinimumHeight" }
29+ SurfaceManagerField { text: "max height"; propertyName: "newSurfaceMaximumHeight" }
30+ SurfaceManagerField { text: "width increment"; propertyName: "newSurfaceWidthIncrement" }
31+ SurfaceManagerField { text: "height increment"; propertyName: "newSurfaceHeightIncrement" }
3332}
tests/qmltests/Stages/tst_DesktopStage.qml+6−5
@@ -40,7 +40,10 @@ Item {
4040 value: false
4141 }
4242
43− Component.onCompleted: resetGeometry()
43+ Component.onCompleted: {
44+ theme.name = "Ubuntu.Components.Themes.SuruDark";
45+ resetGeometry();
46+ }
4447
4548 function resetGeometry() {
4649 // ensures apps which are tested decorations are in view.
@@ -65,7 +68,6 @@ Item {
6568 property bool itemDestroyed: false
6669 sourceComponent: Component {
6770 DesktopStage {
68− color: "white"
6971 anchors.fill: parent
7072 background: "../../../qml/graphics/tablet_background.jpg"
7173
@@ -82,7 +84,7 @@ Item {
8284
8385 Rectangle {
8486 id: controls
85− color: "darkgrey"
87+ color: theme.palette.normal.background
8688 width: units.gu(30)
8789 anchors {
8890 top: parent.top
@@ -98,7 +100,6 @@ Item {
98100 spacing: units.gu(1)
99101
100102 Button {
101− color: "white"
102103 text: "Make surface slow to resize"
103104 activeFocusOnPress: false
104105 onClicked: {
@@ -125,7 +126,7 @@ Item {
125126 }
126127 }
127128
128− SurfaceManagerControls { textColor: "white" }
129+ SurfaceManagerControls { }
129130 }
130131 }
131132 }