Merge lp://qastaging/~3v1n0/unity/hud-dynamic-icon-size into lp://qastaging/unity
| Status: | Merged |
|---|---|
| Approved by: | Marco Trevisan (Treviño) |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2328 |
| Proposed branch: | lp://qastaging/~3v1n0/unity/hud-dynamic-icon-size |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
353 lines (+70/-37) 9 files modified
plugins/unityshell/src/HudController.cpp (+15/-8) plugins/unityshell/src/HudController.h (+3/-0) plugins/unityshell/src/HudIcon.cpp (+15/-11) plugins/unityshell/src/HudIcon.h (+4/-2) plugins/unityshell/src/HudView.cpp (+21/-11) plugins/unityshell/src/HudView.h (+1/-2) plugins/unityshell/src/IconTexture.cpp (+3/-0) plugins/unityshell/src/IconTexture.h (+1/-1) plugins/unityshell/src/unityshell.cpp (+7/-2) |
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/unity/hud-dynamic-icon-size |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey (community) | Approve | ||
| Andrea Cimitan | design | Pending | |
|
Review via email:
|
|||
Commit message
Hud: update the icon size to match the launcher icon size when in auto-hide mode
Plus prevent a couple of crashes
Description of the change
When the launcher is in autohide mode the HUD should update the icon size to follow the launcher icon size.
To do that, now unityshell updates two HudController properties that controls the icon size and the tile size, then we update the HudIcon values accordingly. The HUD icon is now using also a padding that, in case of big icon sizes, makes the HUD to increase its size, keeping the icon far from its borders.
Also I've prevented a couple of crashes in IconTexture and HudView.
Since this is a pure visual change, no testing is needed. Here the fixes:
Hud 48px (standard) icon: http://
Hud 64px icon: http://
Hud 32px icon: http://
| Andrea Cimitan (cimi) wrote | # |
code looks good.