Merge lp:~mzanetti/unity8/wallpaper into lp:unity8

Proposed by Michael Zanetti
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1458
Merged at revision: 1490
Proposed branch: lp:~mzanetti/unity8/wallpaper
Merge into: lp:unity8
Prerequisite: lp:~mzanetti/unity8/uninvert-launcher-in-desktop-mode
Diff against target: 35 lines (+14/-0)
2 files modified
qml/Shell.qml (+5/-0)
qml/Stages/DesktopStage.qml (+9/-0)
To merge this branch: bzr merge lp:~mzanetti/unity8/wallpaper
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Albert Astals Cid (community) Needs Fixing
Gerry Boland (community) Approve
Michał Sawicz Needs Information
Review via email: mp+242461@code.launchpad.net

Commit message

Add support for Wallpaper in Desktop stage

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.

see prereq

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Needs Information
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

fair enough. made it crossfade

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Y
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in tests/qmltests/tst_Shell.qml
1 conflicts encountered.

Note: was top approved before this

review: Needs Fixing
lp:~mzanetti/unity8/wallpaper updated
1458. By Michael Zanetti

merge prereq

Revision history for this message
Michael Zanetti (mzanetti) wrote :

> Text conflict in tests/qmltests/tst_Shell.qml
> 1 conflicts encountered.
>
> Note: was top approved before this

merged

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~mzanetti/unity8/wallpaper updated
1459. By Michael Zanetti

merge prereq

1460. By Michael Zanetti

merge prereq

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml 2014-12-05 11:33:11 +0000
+++ qml/Shell.qml 2014-12-05 11:33:11 +0000
@@ -311,6 +311,11 @@
311 property: "orientation"311 property: "orientation"
312 value: shell.orientation312 value: shell.orientation
313 }313 }
314 Binding {
315 target: applicationsDisplayLoader.item
316 property: "background"
317 value: shell.background
318 }
314 }319 }
315 }320 }
316321
317322
=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml 2014-12-05 11:33:11 +0000
+++ qml/Stages/DesktopStage.qml 2014-12-05 11:33:11 +0000
@@ -25,6 +25,15 @@
2525
26 anchors.fill: parent26 anchors.fill: parent
2727
28 property alias background: wallpaper.source
29
30 CrossFadeImage {
31 id: wallpaper
32 anchors.fill: parent
33 sourceSize { height: root.height; width: root.width }
34 fillMode: Image.PreserveAspectCrop
35 }
36
28 Connections {37 Connections {
29 target: ApplicationManager38 target: ApplicationManager
30 onApplicationAdded: {39 onApplicationAdded: {

Subscribers

People subscribed via source and target branches