Merge lp://staging/~3v1n0/unity/themed-texture-cache into lp://staging/unity
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Andrea Azzarone | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 4096 | ||||||||
| Proposed branch: | lp://staging/~3v1n0/unity/themed-texture-cache | ||||||||
| Merge into: | lp://staging/unity | ||||||||
| Diff against target: |
2126 lines (+476/-369) 37 files modified
dash/DashController.cpp (+1/-0) hud/HudController.cpp (+5/-1) hud/HudView.cpp (+13/-17) hud/HudView.h (+0/-2) launcher/HudLauncherIcon.cpp (+3/-2) launcher/Launcher.cpp (+16/-9) launcher/Launcher.h (+1/-0) lockscreen/CofView.cpp (+8/-7) lockscreen/KylinUserPromptView.cpp (+3/-2) panel/PanelView.cpp (+16/-13) panel/PanelView.h (+1/-0) plugins/unityshell/src/unityshell.cpp (+15/-8) plugins/unityshell/src/unityshell.h (+1/-0) shutdown/SessionButton.cpp (+19/-13) tests/test_thumbnail_generator.cpp (+2/-2) tests/test_unity_window_view.cpp (+3/-3) unity-shared/BackgroundEffectHelper.cpp (+7/-1) unity-shared/BackgroundEffectHelper.h (+2/-1) unity-shared/DashStyle.cpp (+65/-55) unity-shared/DashStyle.h (+11/-10) unity-shared/IconLoader.cpp (+17/-6) unity-shared/IconLoader.h (+1/-0) unity-shared/IconRenderer.cpp (+11/-19) unity-shared/IconTexture.cpp (+5/-5) unity-shared/OverlayRenderer.cpp (+36/-43) unity-shared/OverlayRenderer.h (+1/-1) unity-shared/PanelStyle.cpp (+16/-13) unity-shared/PreviewStyle.cpp (+41/-52) unity-shared/TextInput.cpp (+8/-1) unity-shared/TextInput.h (+1/-0) unity-shared/TextureCache.cpp (+40/-12) unity-shared/TextureCache.h (+8/-6) unity-shared/ThemeSettings.cpp (+15/-1) unity-shared/UnityWindowStyle.cpp (+48/-41) unity-shared/UnityWindowStyle.h (+10/-9) unity-shared/UnityWindowView.cpp (+25/-14) unity-shared/UnityWindowView.h (+1/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~3v1n0/unity/themed-texture-cache | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrea Azzarone (community) | Approve | ||
|
Review via email:
|
|||
Commit message
TextureCache: add support for loading themed textures
When a themed texture is requested, we add it to a list so that we can invalidate
it on theme changes.
Use themed textures in any case we load local files, falling back to the default path if
theme doesn't provide any customized asset.
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
LGTM