Merge lp://qastaging/~azzar1/unity/fix-838854 into lp://qastaging/unity
Proposed by
Andrea Azzarone
| Status: | Merged |
|---|---|
| Approved by: | Andrea Azzarone |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2952 |
| Proposed branch: | lp://qastaging/~azzar1/unity/fix-838854 |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
386 lines (+178/-17) 11 files modified
launcher/ExpoLauncherIcon.cpp (+43/-5) launcher/ExpoLauncherIcon.h (+7/-0) launcher/LauncherController.cpp (+1/-0) launcher/LauncherIcon.cpp (+1/-1) plugins/unityshell/src/unityshell.cpp (+4/-1) tests/test_expo_launcher_icon.cpp (+71/-10) unity-shared/PluginAdapter.cpp (+16/-0) unity-shared/PluginAdapter.h (+4/-0) unity-shared/StandaloneWindowManager.cpp (+19/-0) unity-shared/StandaloneWindowManager.h (+7/-0) unity-shared/WindowManager.h (+5/-0) |
| To merge this branch: | bzr merge lp://qastaging/~azzar1/unity/fix-838854 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Trevisan (Treviño) | Approve | ||
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
Change expo launcher icon depending on which workspace is currently being utilised.
Description of the change
== Problem ==
Bug #838854: Workspaces, Launcher - The workspace Launcher icon should change depending on which workspace is currently being utilised
== Tests ==
Unit tests added.
Requires: https:/
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
Looks good, even if I'd prefer a dynamic icon with cairo... But this is fine for now.