git.iko.soy/unity8
on xenial help sign in
Fix the last chance popup colors/theme
679180fLukáš Tinkl
qml/Components/Lockscreen.qml+2−2
compare with xenial
unifiedsplit
@@ -253,10 +253,10 @@ Showable {
253
253
254 Component {
254 Component {
255 id: infoPopupComponent
255 id: infoPopupComponent
256− Dialog {
256+ ShellDialog {
257 id: dialog
257 id: dialog
258 objectName: "infoPopup"
258 objectName: "infoPopup"
259− modal: true
259+ property var dialogLoader // dummy to satisfy ShellDialog's context dependent prop
260
260
261 Button {
261 Button {
262 objectName: "infoPopupOkButton"
262 objectName: "infoPopupOkButton"
tests/qmltests/Greeter/tst_NarrowView.qml+3−1
@@ -27,6 +27,8 @@ Item {
27 width: units.gu(90)
27 width: units.gu(90)
28 height: units.gu(80)
28 height: units.gu(80)
29
29
30+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark" // use the same theme as the real shell
31+
30 Row {
32 Row {
31 anchors.fill: parent
33 anchors.fill: parent
32 Loader {
34 Loader {
@@ -61,7 +63,7 @@ Item {
61
63
62 Rectangle {
64 Rectangle {
63 id: controls
65 id: controls
64− color: "white"
66+ color: theme.palette.normal.background
65 width: units.gu(40)
67 width: units.gu(40)
66 height: parent.height
68 height: parent.height
67
69