git.iko.soy/unity8
on xenial help sign in
Still binding loop
83fd0faAndrea Cimitan
Shell.qml+5−3
compare with xenial
unifiedsplit
@@ -43,7 +43,7 @@ FocusScope {
43
43
44 property real edgeSize: units.gu(2)
44 property real edgeSize: units.gu(2)
45 property url defaultBackground: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"
45 property url defaultBackground: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"
46− property url background: backgroundSettings.pictureUri
46+ property url background: backgroundImage.source
47 readonly property real panelHeight: panel.panelHeight
47 readonly property real panelHeight: panel.panelHeight
48
48
49 property bool dashShown: dash.shown
49 property bool dashShown: dash.shown
@@ -119,8 +119,6 @@ FocusScope {
119 GSettings {
119 GSettings {
120 id: backgroundSettings
120 id: backgroundSettings
121 schema.id: "org.gnome.desktop.background"
121 schema.id: "org.gnome.desktop.background"
122−
123− onPictureUriChanged: backgroundImage.source = pictureUri
124 }
122 }
125
123
126 VolumeControl {
124 VolumeControl {
@@ -151,8 +149,12 @@ FocusScope {
151 id: backgroundImage
149 id: backgroundImage
152 objectName: "backgroundImage"
150 objectName: "backgroundImage"
153
151
152+ property url gSettingsPicture: backgroundSettings.pictureUri
153+
154 anchors.fill: parent
154 anchors.fill: parent
155
155
156+ onGSettingsPictureChanged: source = gSettingsPicture
157+
156 onStatusChanged: {
158 onStatusChanged: {
157 if (status == Image.Error && source != defaultBackground) {
159 if (status == Image.Error && source != defaultBackground) {
158 source = defaultBackground
160 source = defaultBackground