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

Proposed by Florian Boucault
Status: Merged
Approved by: Cris Dywan
Approved revision: 2023
Merged at revision: 2025
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/icon_load_when_completed
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 22 lines (+4/-1)
1 file modified
src/Ubuntu/Components/1.3/Icon.qml (+4/-1)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/icon_load_when_completed
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+298791@code.launchpad.net

Commit message

Icon: only load when completed and therefore avoids multiple reloads caused by size changes.

Description of the change

Icon: only load when completed and therefore avoids multiple reloads caused by size changes.

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :
2023. By Florian Boucault

No new public property.

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: 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: 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: 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: 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
Cris Dywan (kalikiana) wrote :

Lovely fine-tuning!

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/1.3/Icon.qml'
2--- src/Ubuntu/Components/1.3/Icon.qml 2016-05-25 12:48:10 +0000
3+++ src/Ubuntu/Components/1.3/Icon.qml 2016-06-30 14:48:08 +0000
4@@ -110,6 +110,8 @@
5 implicitWidth: image.implicitWidth
6 implicitHeight: image.implicitHeight
7
8+ Component.onCompleted: image.completed = true
9+
10 Image {
11 id: image
12 objectName: "image"
13@@ -121,7 +123,8 @@
14 height: icon.height
15 }
16
17- source: icon.name ? "image://theme/%1".arg(icon.name) : ""
18+ property bool completed: false
19+ source: completed && icon.name ? "image://theme/%1".arg(icon.name) : ""
20
21 cache: true
22 visible: !colorizedImage.visible

Subscribers

People subscribed via source and target branches