Fix the last chance popup colors/theme
Approved by: Michael Terry
commit679180f1d133e360298b7c81a5419553aacd3d21
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateWed 30 Mar 2016, 07:46 (11 years ago)
parent149137b7810611
qml/Components/Lockscreen.qml+2−2
@@ -253,10 +253,10 @@ Showable {
253253
254254 Component {
255255 id: infoPopupComponent
256− Dialog {
256+ ShellDialog {
257257 id: dialog
258258 objectName: "infoPopup"
259− modal: true
259+ property var dialogLoader // dummy to satisfy ShellDialog's context dependent prop
260260
261261 Button {
262262 objectName: "infoPopupOkButton"
tests/qmltests/Greeter/tst_NarrowView.qml+3−1
@@ -27,6 +27,8 @@ Item {
2727 width: units.gu(90)
2828 height: units.gu(80)
2929
30+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark" // use the same theme as the real shell
31+
3032 Row {
3133 anchors.fill: parent
3234 Loader {
@@ -61,7 +63,7 @@ Item {
6163
6264 Rectangle {
6365 id: controls
64− color: "white"
66+ color: theme.palette.normal.background
6567 width: units.gu(40)
6668 height: parent.height
6769