git.iko.soy/unity8
on xenial help sign in
color palette fixes
064b28fLukáš Tinkl
tests/qmltests/Stages/SurfaceManagerControls.qml+7−8
compare with xenial
unifiedsplit
@@ -20,14 +20,13 @@ import Unity.Application 0.1
20
20
21Column {
21Column {
22 id: root
22 id: root
23− property color textColor: "black"
24
23
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}
26
25
27− SurfaceManagerField { text: "min width"; propertyName: "newSurfaceMinimumWidth"; textColor: root.textColor }
26+ SurfaceManagerField { text: "min width"; propertyName: "newSurfaceMinimumWidth" }
28− SurfaceManagerField { text: "max width"; propertyName: "newSurfaceMaximumWidth"; textColor: root.textColor }
27+ SurfaceManagerField { text: "max width"; propertyName: "newSurfaceMaximumWidth" }
29− SurfaceManagerField { text: "min height"; propertyName: "newSurfaceMinimumHeight"; textColor: root.textColor }
28+ SurfaceManagerField { text: "min height"; propertyName: "newSurfaceMinimumHeight" }
30− SurfaceManagerField { text: "max height"; propertyName: "newSurfaceMaximumHeight"; textColor: root.textColor }
29+ SurfaceManagerField { text: "max height"; propertyName: "newSurfaceMaximumHeight" }
31− SurfaceManagerField { text: "width increment"; propertyName: "newSurfaceWidthIncrement"; textColor: root.textColor }
30+ SurfaceManagerField { text: "width increment"; propertyName: "newSurfaceWidthIncrement" }
32− SurfaceManagerField { text: "height increment"; propertyName: "newSurfaceHeightIncrement"; textColor: root.textColor }
31+ SurfaceManagerField { text: "height increment"; propertyName: "newSurfaceHeightIncrement" }
33}
32}
tests/qmltests/Stages/tst_DesktopStage.qml+6−5
@@ -40,7 +40,10 @@ Item {
40 value: false
40 value: false
41 }
41 }
42
42
43− Component.onCompleted: resetGeometry()
43+ Component.onCompleted: {
44+ theme.name = "Ubuntu.Components.Themes.SuruDark";
45+ resetGeometry();
46+ }
44
47
45 function resetGeometry() {
48 function resetGeometry() {
46 // ensures apps which are tested decorations are in view.
49 // ensures apps which are tested decorations are in view.
@@ -65,7 +68,6 @@ Item {
65 property bool itemDestroyed: false
68 property bool itemDestroyed: false
66 sourceComponent: Component {
69 sourceComponent: Component {
67 DesktopStage {
70 DesktopStage {
68− color: "white"
69 anchors.fill: parent
71 anchors.fill: parent
70 background: "../../../qml/graphics/tablet_background.jpg"
72 background: "../../../qml/graphics/tablet_background.jpg"
71
73
@@ -82,7 +84,7 @@ Item {
82
84
83 Rectangle {
85 Rectangle {
84 id: controls
86 id: controls
85− color: "darkgrey"
87+ color: theme.palette.normal.background
86 width: units.gu(30)
88 width: units.gu(30)
87 anchors {
89 anchors {
88 top: parent.top
90 top: parent.top
@@ -98,7 +100,6 @@ Item {
98 spacing: units.gu(1)
100 spacing: units.gu(1)
99
101
100 Button {
102 Button {
101− color: "white"
102 text: "Make surface slow to resize"
103 text: "Make surface slow to resize"
103 activeFocusOnPress: false
104 activeFocusOnPress: false
104 onClicked: {
105 onClicked: {
@@ -125,7 +126,7 @@ Item {
125 }
126 }
126 }
127 }
127
128
128− SurfaceManagerControls { textColor: "white" }
129+ SurfaceManagerControls { }
129 }
130 }
130 }
131 }
131 }
132 }