git.iko.soy/unity8
on xenial help sign in
s/BackgroundResolver/WallpaperResolver
commit33468df60e9a372ba51f3c442706fad68b7343e5 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateMon 5 Oct 2015, 13:04 (11 years ago) parentc0c620a
3 files changed+10−14
compare with xenial
unifiedsplit
qml/Components/BackgroundResolver.qml → qml/Components/WallpaperResolver.qml+2−6 qml/DisabledScreenNotice.qml+3−3 qml/Shell.qml+5−5
qml/Components/BackgroundResolver.qml → qml/Components/WallpaperResolver.qmlrenamed+2−6
@@ -26,17 +26,13 @@ import Ubuntu.Components 1.3
2626 - Background set in GSettings, if any
2727 */
2828QtObject {
29− /*
30− Users should set their UI width here.
31− */
29+ // Users should set their UI width here.
3230 property real width
3331
3432 property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
3533 : "../graphics/phone_background.jpg")
3634
37− /*
38− That's the property users of this component are going to consume.
39− */
35+ // That's the property users of this component are going to consume.
4036 readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
4137 : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
4238
qml/DisabledScreenNotice.qml+3−3
@@ -21,12 +21,12 @@ import "Components"
2121Image {
2222 id: root
2323
24− BackgroundResolver {
24+ WallpaperResolver {
2525 width: root.width
26− id: bgResolver
26+ id: wallpaperResolver
2727 }
2828
29− source: bgResolver.background
29+ source: wallpaperResolver.background
3030
3131 UbuntuShape {
3232 anchors.fill: text
qml/Shell.qml+5−5
@@ -108,8 +108,8 @@ Item {
108108
109109 property real edgeSize: units.gu(2)
110110
111− BackgroundResolver {
112− id: bgResolver
111+ WallpaperResolver {
112+ id: wallpaperResolver
113113 width: shell.width
114114 }
115115
@@ -299,7 +299,7 @@ Item {
299299 Binding {
300300 target: applicationsDisplayLoader.item
301301 property: "background"
302− value: bgResolver.background
302+ value: wallpaperResolver.background
303303 }
304304 Binding {
305305 target: applicationsDisplayLoader.item
@@ -404,7 +404,7 @@ Item {
404404 tabletMode: shell.usageScenario != "phone"
405405 launcherOffset: launcher.progress
406406 forcedUnlock: tutorial.running
407− background: bgResolver.background
407+ background: wallpaperResolver.background
408408
409409 // avoid overlapping with Launcher's edge drag area
410410 // FIXME: Fix TouchRegistry & friends and remove this workaround
@@ -579,7 +579,7 @@ Item {
579579 id: wizard
580580 objectName: "wizard"
581581 anchors.fill: parent
582− background: bgResolver.background
582+ background: wallpaperResolver.background
583583
584584 function unlockWhenDoneWithWizard() {
585585 if (!active) {