Merge lp:~agateau/unity-2d/keep-launcher-if-maximized-window-is-on-other-monitor into lp:unity-2d/3.0

[Aurélien Gâteau]

[launcher] Keep launcher visible when window is maximized on another monitor

No need to special-case maximized windows: checking window geometry works for
"normal" and maximized windows.

Simple fix I found while working on the new intellihide behavior. Should be straighforward to review.

[Olivier Tilloy (osomon)]

Less code is always better code! As a bonus, I verified that it actually works as advertised ;)
Go for it!

review: Approve

=== modified file 'launcher/app/intellihidebehavior.cpp'
--- launcher/app/intellihidebehavior.cpp	2011-03-14 15:25:50 +0000
+++ launcher/app/intellihidebehavior.cpp	2011-03-15 11:41:04 +0000
@@ -151,20 +151,11 @@
             WnckWindowState state = wnck_window_get_state(window);
 
             // Skip hidden (==minimized and other states) windows
-            // Note: check this *before* checking if window is maximized
-            // because a window can be both minimized and maximized
             if (state & WNCK_WINDOW_STATE_HIDDEN) {
                 continue;
             }
 
-            // Maximized window should always be considered as crossing the
-            // window
-            if (state & WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY) {
-                crossWindow = true;
-                break;
-            }
-
-            // Not maximized => really check the window rect
+            // Check the window rect
             int x, y, width, height;
             wnck_window_get_geometry(window, &x, &y, &width, &height);
             QRect rect(x, y, width, height);