Merge lp:~3v1n0/unity/fix-690143 into lp:unity
Status: | Merged |
---|---|
Merged at revision: | 1462 |
Proposed branch: | lp:~3v1n0/unity/fix-690143 |
Merge into: | lp:unity |
Diff against target: |
554 lines (+169/-33) 13 files modified
plugins/unityshell/src/AbstractIconRenderer.h (+2/-0) plugins/unityshell/src/BamfLauncherIcon.cpp (+40/-1) plugins/unityshell/src/BamfLauncherIcon.h (+1/-0) plugins/unityshell/src/IconRenderer.cpp (+5/-6) plugins/unityshell/src/Launcher.cpp (+52/-3) plugins/unityshell/src/Launcher.h (+7/-0) plugins/unityshell/src/PluginAdapter.cpp (+24/-0) plugins/unityshell/src/PluginAdapter.h (+3/-0) plugins/unityshell/src/WindowManager.cpp (+5/-0) plugins/unityshell/src/WindowManager.h (+6/-0) plugins/unityshell/src/compizminimizedwindowhandler.h (+14/-6) plugins/unityshell/src/unityshell.cpp (+1/-16) plugins/unityshell/unityshell.xml.in (+9/-1) |
To merge this branch: | bzr merge lp:~3v1n0/unity/fix-690143 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jason Smith (community) | Approve | ||
Review via email: mp+73430@code.launchpad.net |
This proposal supersedes a proposal from 2011-07-29.
Description of the change
Proposal of merge resubmitted after the update of the branch against the newest unity trunk.
I never experienced the crash that Jason found on my test with this version (as I never found one with the previous one), and it also fixes a new bug introduced by the CompizMinimized
Old merge request message (still valid)
=======
Fixed bug #690143 as requested by the design team specifications.
To get this I had to get signals from Compiz related to the viewport switch, so to achive this and to keep the implementation clean, I decided to implement the new PluginAdapter signals compiz_
So now both Launcher and BamfLauncherIcon are listening to these signals to perform their operations. In particular BamfLauncherIcon uses it to check if, after a viewport switch (or a scale terminate), all the windows of the given Icon are viewable in the current workspace and to update the icon indicator accordingly.
Plus I decided to give also another Icon backlight coloring option, and after talking with JohnLea on #ayatana I also added two more options to the "Backlight Mode":
- Edge Illumination Toggles: illuminate only the edge of the icons linked to
- Backlight and Edge Illumination Toggles: illuminate the background of the
You can see a working example of the "Backlight and Edge Illumination Toggles" option on this screenshot [1].
[1] https:/
Crashes in current trunk