git.iko.soy/unity8
on xenial help sign in
Fix display of the default wallpaper in the Drawer
305605cDalton Durst
qml/Launcher/Drawer.qml+3−2
compare with xenial
unifiedsplit
@@ -31,6 +31,7 @@ FocusScope {
31 readonly property bool moving: appList && appList.moving
31 readonly property bool moving: appList && appList.moving
32 readonly property Item searchTextField: searchField
32 readonly property Item searchTextField: searchField
33 readonly property real delegateWidth: units.gu(10)
33 readonly property real delegateWidth: units.gu(10)
34+ property url background
34 visible: x > -width
35 visible: x > -width
35 property var fullyOpen: x === 0
36 property var fullyOpen: x === 0
36 property var fullyClosed: x === -width
37 property var fullyClosed: x === -width
@@ -149,7 +150,7 @@ FocusScope {
149 Image {
150 Image {
150 id: background
151 id: background
151 anchors.fill: parent
152 anchors.fill: parent
152− source: AccountsService.backgroundFile
153+ source: root.background
153 fillMode: Image.PreserveAspectCrop
154 fillMode: Image.PreserveAspectCrop
154 }
155 }
155
156
@@ -159,7 +160,7 @@ FocusScope {
159 radius: 128
160 radius: 128
160 }
161 }
161
162
162− // Workaround for images with fastblur can't use opacity
163+ // Images with fastblur can't use opacity, so we'll put this on top
163 Rectangle {
164 Rectangle {
164 anchors.fill: background
165 anchors.fill: background
165 color: parent.color
166 color: parent.color
qml/Launcher/Launcher.qml+2
@@ -33,6 +33,7 @@ FocusScope {
33 property int topPanelHeight: 0
33 property int topPanelHeight: 0
34 property bool drawerEnabled: true
34 property bool drawerEnabled: true
35 property alias privateMode: panel.privateMode
35 property alias privateMode: panel.privateMode
36+ property url background
36
37
37 property int panelWidth: units.gu(10)
38 property int panelWidth: units.gu(10)
38 property int dragAreaWidth: units.gu(1)
39 property int dragAreaWidth: units.gu(1)
@@ -353,6 +354,7 @@ FocusScope {
353 bottom: parent.bottom
354 bottom: parent.bottom
354 right: parent.left
355 right: parent.left
355 }
356 }
357+ background: root.background
356 width: Math.min(root.width, units.gu(81))
358 width: Math.min(root.width, units.gu(81))
357 panelWidth: panel.width
359 panelWidth: panel.width
358 allowSlidingAnimation: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate
360 allowSlidingAnimation: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate
qml/Shell.qml+1
@@ -582,6 +582,7 @@ StyledItem {
582 topPanelHeight: panel.panelHeight
582 topPanelHeight: panel.panelHeight
583 drawerEnabled: !greeter.active
583 drawerEnabled: !greeter.active
584 privateMode: greeter.active
584 privateMode: greeter.active
585+ background: wallpaperResolver.cachedBackground
585
586
586 onShowDashHome: showHome()
587 onShowDashHome: showHome()
587 onLauncherApplicationSelected: {
588 onLauncherApplicationSelected: {