Merge lp:~fboucault/unity-2d/dash_thumb_respect_ratio into lp:unity-2d/3.0

Proposed by Florian Boucault on 2011-08-23
Status: Merged
Approved by: Gerry Boland on 2011-08-23
Approved revision: 682
Merged at revision: 684
Proposed branch: lp:~fboucault/unity-2d/dash_thumb_respect_ratio
Merge into: lp:unity-2d/3.0
Diff against target: 12 lines (+1/-1)
1 file modified
libunity-2d-private/src/iconimageprovider.cpp (+1/-1)
To merge this branch: bzr merge lp:~fboucault/unity-2d/dash_thumb_respect_ratio
Reviewer Review Type Date Requested Status
Gerry Boland 2011-08-23 Pending
Review via email: mp+72609@code.launchpad.net

Description of the change

[dash] IconImageProvider: preserve the aspect ratio when loading the icon.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libunity-2d-private/src/iconimageprovider.cpp'
2--- libunity-2d-private/src/iconimageprovider.cpp 2011-07-29 13:49:34 +0000
3+++ libunity-2d-private/src/iconimageprovider.cpp 2011-08-23 17:36:17 +0000
4@@ -68,7 +68,7 @@
5 }
6
7 if (requestedSize.isValid()) {
8- icon = icon.scaled(requestedSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
9+ icon = icon.scaled(requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
10 }
11
12 if (size) {

Subscribers

People subscribed via source and target branches