Merge lp:~fboucault/ubuntu-ui-toolkit/progression_visual_lazy into lp:ubuntu-ui-toolkit/staging

Proposed by Florian Boucault
Status: Merged
Approved by: Cris Dywan
Approved revision: 2004
Merged at revision: 2011
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/progression_visual_lazy
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 34 lines (+3/-3)
2 files modified
src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml (+1/-1)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/progression_visual_lazy
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+297336@code.launchpad.net

Commit message

ProgressionVisual: do not load the icon until the progression is made visible.

Description of the change

ProgressionVisual: do not load the icon until the progression is made visible.

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

Good to go.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml'
2--- src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml 2015-04-24 14:52:19 +0000
3+++ src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml 2016-06-14 13:17:07 +0000
4@@ -27,7 +27,7 @@
5
6 Image {
7 id: progressIcon
8- source: progressionIconSource
9+ source: visible ? progressionIconSource : ""
10 anchors {
11 verticalCenter: parent.verticalCenter
12 right: parent.right
13@@ -46,7 +46,7 @@
14 right: progressIcon.left
15 rightMargin: styledItem.splitMargin
16 }
17- source: progressionDividerSource
18+ source: visible ? progressionDividerSource : ""
19 opacity: enabled ? 1.0 : 0.5
20 }
21 }
22
23=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml'
24--- src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml 2015-04-25 07:36:13 +0000
25+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml 2016-06-14 13:17:07 +0000
26@@ -46,7 +46,7 @@
27 right: progressIcon.left
28 rightMargin: styledItem.splitMargin
29 }
30- source: progressionDividerSource
31+ source: visible ? progressionDividerSource : ""
32 opacity: enabled ? 1.0 : 0.5
33 }
34 }

Subscribers

People subscribed via source and target branches