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
1=== modified file 'qml/Shell.qml'
2--- qml/Shell.qml 2014-12-05 11:33:11 +0000
3+++ qml/Shell.qml 2014-12-05 11:33:11 +0000
4@@ -311,6 +311,11 @@
5 property: "orientation"
6 value: shell.orientation
7 }
8+ Binding {
9+ target: applicationsDisplayLoader.item
10+ property: "background"
11+ value: shell.background
12+ }
13 }
14 }
15
16
17=== modified file 'qml/Stages/DesktopStage.qml'
18--- qml/Stages/DesktopStage.qml 2014-12-05 11:33:11 +0000
19+++ qml/Stages/DesktopStage.qml 2014-12-05 11:33:11 +0000
20@@ -25,6 +25,15 @@
21
22 anchors.fill: parent
23
24+ property alias background: wallpaper.source
25+
26+ CrossFadeImage {
27+ id: wallpaper
28+ anchors.fill: parent
29+ sourceSize { height: root.height; width: root.width }
30+ fillMode: Image.PreserveAspectCrop
31+ }
32+
33 Connections {
34 target: ApplicationManager
35 onApplicationAdded: {

Subscribers

People subscribed via source and target branches