git.iko.soy/unity8
on xenial help sign in
Fix theme in ShellDialog
12ba388Joan CiberSheep
qml/Components/ShellDialog.qml+7−10
compare with xenial
unifiedsplit
@@ -15,9 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−
19import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
20−import Ubuntu.Components.Themes 1.3
21import Ubuntu.Components.Popups 1.3
19import Ubuntu.Components.Popups 1.3
22import Utils 0.1
20import Utils 0.1
23
21
@@ -35,20 +33,19 @@ Dialog {
35
33
36 default property alias columnContents: column.data
34 default property alias columnContents: column.data
37
35
36+ onVisibleChanged: {
37+ if (!visible && dialogLoader) {
38− onVisibleChanged: { if (!visible && dialogLoader) { dialogLoader.active = false; } }
38+ dialogLoader.active = false;
39+ }
40+ }
39
41
40 focus: true
42 focus: true
41
43
42− // FIXME: this is a hack because Dialog subtheming seems broken atm
43− // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
44− ThemeSettings {
44+ theme: ThemeSettings {
45− id: themeHack
45+ name: "Ubuntu.Components.Themes.Ambiance"
46 }
46 }
47
47
48 Component.onCompleted: {
48 Component.onCompleted: {
49− themeHack.palette.normal.overlay = "white";
50− themeHack.palette.normal.overlayText = UbuntuColors.slate;
51− __foreground.theme = themeHack
52 show();
49 show();
53 }
50 }
54
51