Merge lp:~aacid/unity-2d/panel_mm_fixes into lp:unity-2d

[Albert Astals Cid]

[panel] Multimonitor Fixes for panel emulating window decoration. For example prevents panel on screen 1 unmaximising a maximised & active window on screen 2

This ensures if you double click in a panel, it will only unmaximize the currently active window (m_window) if it is in the same screen as the panel. Similarly if you press+move in a panel, it will only drag the currently active window (m_window) if it is in the same screen as the panel

[panel] Multimonitor Fixes

If you double click in a panel, it will only unmaximize the currently active window (m_window) if it is in the same screen as the panel
If you press+move in a panel, it will only drag the currently active window (m_window) if it is in the same screen as the panel

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2012-05-24 11:18:30 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-05-25 09:05:42 +0000
@@ -213,7 +213,7 @@
 {
     if (DashClient::instance()->activeInScreen(d->screen())) {
         dash2dConfiguration().setProperty("fullScreen", QVariant(false));
-    } else {
+    } else if (isMostlyOnScreen(d->screen())) {
         wnck_window_unmaximize(d->m_window);
     }
 }
@@ -229,24 +229,26 @@
 
 void WindowHelper::drag(const QPoint& pos)
 {
-    // this code IMO should ultimately belong to wnck
-    if (wnck_window_is_maximized(d->m_window)) {
-        XEvent xev;
-        QX11Info info;
-        Atom netMoveResize = XInternAtom(QX11Info::display(), "_NET_WM_MOVERESIZE", false);
-        xev.xclient.type = ClientMessage;
-        xev.xclient.message_type = netMoveResize;
-        xev.xclient.display = QX11Info::display();
-        xev.xclient.window = wnck_window_get_xid(d->m_window);
-        xev.xclient.format = 32;
-        xev.xclient.data.l[0] = pos.x();
-        xev.xclient.data.l[1] = pos.y();
-        xev.xclient.data.l[2] = 8; // _NET_WM_MOVERESIZE_MOVE
-        xev.xclient.data.l[3] = Button1;
-        xev.xclient.data.l[4] = 0;
-        XUngrabPointer(QX11Info::display(), QX11Info::appTime());
-        XSendEvent(QX11Info::display(), QX11Info::appRootWindow(info.screen()), false,
-                   SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+    if (isMostlyOnScreen(d->screen())) {
+        // this code IMO should ultimately belong to wnck
+        if (wnck_window_is_maximized(d->m_window)) {
+            XEvent xev;
+            QX11Info info;
+            Atom netMoveResize = XInternAtom(QX11Info::display(), "_NET_WM_MOVERESIZE", false);
+            xev.xclient.type = ClientMessage;
+            xev.xclient.message_type = netMoveResize;
+            xev.xclient.display = QX11Info::display();
+            xev.xclient.window = wnck_window_get_xid(d->m_window);
+            xev.xclient.format = 32;
+            xev.xclient.data.l[0] = pos.x();
+            xev.xclient.data.l[1] = pos.y();
+            xev.xclient.data.l[2] = 8; // _NET_WM_MOVERESIZE_MOVE
+            xev.xclient.data.l[3] = Button1;
+            xev.xclient.data.l[4] = 0;
+            XUngrabPointer(QX11Info::display(), QX11Info::appTime());
+            XSendEvent(QX11Info::display(), QX11Info::appRootWindow(info.screen()), false,
+                    SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+        }
     }
 }
 

=== modified file 'tests/manual-tests/panel.txt'
--- tests/manual-tests/panel.txt	2012-05-21 10:35:22 +0000
+++ tests/manual-tests/panel.txt	2012-05-25 09:05:42 +0000
@@ -53,3 +53,13 @@
  * Go to the panel and double click the middle mouse button
  * Verify the fullscreen window stays maximized
 ----
+ * Have two monitors
+ * Maximize one window
+ * Double click the panel in the monitor that does not contain the window
+ * Verify the window stays maximized
+----
+* Have two monitors
+ * Maximize one window
+ * Press and drag the mouse in the panel in the monitor that does not contain the window
+ * Verify the window stays unaffected
+----