Unity

launcher/AbstractLauncherIcon.h (+9/-9)
launcher/ApplicationLauncherIcon.cpp (+12/-10)
launcher/ApplicationLauncherIcon.h (+1/-1)
launcher/BFBLauncherIcon.cpp (+2/-4)
launcher/DesktopLauncherIcon.cpp (+0/-1)
launcher/ExpoLauncherIcon.cpp (+0/-2)
launcher/HudLauncherIcon.cpp (+5/-11)
launcher/Launcher.cpp (+152/-153)
launcher/Launcher.h (+1/-3)
launcher/LauncherController.cpp (+11/-13)
launcher/LauncherControllerPrivate.h (+1/-2)
launcher/LauncherIcon.cpp (+107/-80)
launcher/LauncherIcon.h (+28/-31)
launcher/MockLauncherIcon.h (+55/-21)
launcher/SingleMonitorLauncherIcon.cpp (+4/-6)
launcher/SingleMonitorLauncherIcon.h (+4/-5)
launcher/SoftwareCenterLauncherIcon.cpp (+5/-7)
launcher/SpacerLauncherIcon.cpp (+0/-1)
launcher/StandaloneLauncher.cpp (+6/-1)
launcher/XdndCollectionWindow.h (+1/-0)
launcher/XdndCollectionWindowImp.cpp (+8/-2)
launcher/XdndCollectionWindowImp.h (+1/-0)
launcher/XdndManager.h (+4/-2)
launcher/XdndManagerImp.cpp (+20/-12)
launcher/XdndManagerImp.h (+5/-2)
plugins/unityshell/src/unityshell.cpp (+1/-1)
plugins/unityshell/src/unityshell.h (+2/-1)
tests/mock-application.h (+4/-2)
tests/test_application_launcher_icon.cpp (+2/-10)
tests/test_bamf_application.cpp (+3/-2)
tests/test_expo_launcher_icon.cpp (+2/-11)
tests/test_launcher.cpp (+30/-40)
tests/test_launcher_controller.cpp (+125/-19)
tests/test_launcher_hover_machine.cpp (+3/-3)
tests/test_launcher_icon.cpp (+225/-12)
tests/test_layout_system.cpp (+12/-10)
tests/test_panel_menu_view.cpp (+2/-6)
tests/test_panel_view.cpp (+2/-4)
tests/test_shortcut_modeller_compiz.cpp (+3/-4)
tests/test_software_center_launcher_icon.cpp (+14/-4)
tests/test_standalone_wm.h (+60/-0)
tests/test_switcher_controller.h (+3/-2)
tests/test_switcher_controller_class.cpp (+7/-4)
tests/test_switcher_view.cpp (+2/-6)
tests/test_window_buttons.cpp (+2/-6)
tests/test_xdnd_manager_imp.cpp (+40/-29)
unity-shared/StandaloneWindowManager.cpp (+38/-15)
unity-shared/StandaloneWindowManager.h (+3/-0)
unity-shared/TimeUtil.h (+47/-4)
unity-standalone/StandaloneUnity.cpp (+7/-2)

To merge this branch:

bzr merge lp://staging/~3v1n0/unity/multi-monitor-icon-quirks

Related bugs:

Bug #1051913: Week 38 - Launchers on both monitors desaturate if dash is open in 1	Medium	Fix Released
Bug #1064514: [regression] Dash - When a drag and drop action from the Dash is abandoned by dropping the item back into the Dash, all the Launcher icons 'flicker' as they suddenly loose their tinting for a brief moment	High	Fix Released
Bug #1240737: Icon opened when Dash/Hud is opened are not desaturated	Low	Fix Released
Bug #1240750: When minimizing a window only the relevant monitor's launcher icon should animate	Low	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-10-22
Brandon Schaefer (community)		2013-10-14	Approve on 2013-10-22
Review via email: mp+191020@code.staging.launchpad.net

Commit message

LauncherIcon: add MultiMonitor quirks support

A quirk can be now set for all monitors or for just one

Description of the change

Make the Icon Quirks to be multi-monitor aware. Each icon property can be applied to both all monitors or just a specified one. This allows to apply effects such as de-saturation and visibility to just one monitor (like on DnD or when an overlay is opened).

Also Improved XdndManager not to strictly depend on X, use XdndCollectionWindow to get the DnD data we need. This allows proper unit-testing.

This required to update some tests. Also, I've added a testwrapper::StandaloneWM wrapper that allows to cast and wrap the StaticWindowManager so that we don't have to worry about resetting its state at the end of each test (not to break the others assumptions).
Added new tests as well.

Revision history for this message