lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:ubuntu-ui-toolkit

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-08-27

Tim Peeters: Needs Resubmitting on 2014-08-27

Albert Astals Cid (community): Needs Information on 2014-08-27

Diff: 404 lines (+253/-64) (has conflicts)

7 files modified

debian/control (+1/-1)
modules/Ubuntu/Components/Icon10.qml (+8/-36)
modules/Ubuntu/Components/plugin/plugin.pro (+4/-0)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+224/-25)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.h (+3/-0)
tests/unit_x11/tst_components/tst_components.cpp (+12/-1)
tests/unit_x11/tst_components/tst_icon.qml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1324184: UnityThemeIconProvider: Icons fall back to lower priority themes before checking alternative names

Medium

Fix Released

Link a bug report

Related blueprints

1233. By Lars Karlitski on 2014-09-02

unitythemeiconprovider: typedef shared IconTheme pointer

1232. By Lars Karlitski on 2014-09-02

Icon10: give source an empty fallback

1231. By Lars Karlitski on 2014-09-02

unitythemeiconprovider: use QStandardLocation

1230. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: also return the largest icon when requested size is 0

There's a test and a bug about it. Seems to be expected behavior.

1229. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: support size == -1

Qt sets requestedSize to -1 if no size has been specified. Return the largest
available icon in that case.

1228. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: don't load icons that might not be used

Only load the icon that has the best matching size, not the ones encountered
while searching for it.

1227. By Lars Karlitski on 2014-08-27

tst_components: set XDG_DATA_DIRS so that icons are found

1226. By Lars Karlitski on 2014-08-27

unitythemeiconprovider: use qgetenv instead of getenv

1225. By Lars Karlitski on 2014-08-26

Icon: remove unnecessary sizing workaround

UnityThemeIconProvider behaves correctly now for small icon sizes.

This patch also makes sure that icons are always drawn with the correct aspect
ratio. Consumers only need to supply a height, whereas they needed to set both
width and height.

In the process, the update() function was removed and is thus not called when
the width and height of the Icon changes. This causes no regressions, as Qt
doesn't reload icons with the same url anyway.

1224. By Lars Karlitski on 2014-08-25

unitythemeiconprovider: manually load icons

Previously, UnityThemeIconProvider used QIcon::fromTheme() to lookup and load
icons. That function uses fdo's default icon lookup algorithm: it looks at the
current theme and all parent themes for each icon in turn. We'd prefer a
breadth-first search, where all icon names are looked up in the current theme
before falling back to the parent themes (see lp: #1324184). This patch
implements fdo's FindBestIcon() algorithm, which behaves like that.

It also now properly support rectangular icons and always returns an icon with
the requested size (adjusted for preserving the aspect ratio).