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

[Albert Astals Cid]

[panel] Clicking in the panel focuses the maximized window on that screen

[panel] Clicking in the panel focuses the maximized window on that screen

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2012-05-24 11:18:30 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-05-25 10:07:19 +0000
@@ -400,6 +400,12 @@
 
 void AppNameApplet::mousePressEvent(QMouseEvent* event) {
     if (event->button() == Qt::LeftButton) {
+        if (!d->m_label->geometry().contains(event->pos()) || !d->m_label->isVisible()) {
+            // Clicked outside the label and outside the menus
+            // focus the top most maximized window
+            d->m_windowHelper->focusTopMostMaximizedWindowOnScreen();
+        }
+
         d->m_dragStartPosition = event->pos();
         d->m_dragInProgress = true;
     } else {
 
=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2012-05-25 10:07:19 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-05-25 10:07:19 +0000
@@ -178,6 +178,32 @@
     return true;
 }
 
+void WindowHelper::focusTopMostMaximizedWindowOnScreen() const
+{
+    WnckWindow *topMostMaximizedWindowOnScreen = NULL;
+    GList *stack = wnck_screen_get_windows_stacked(wnck_screen_get_default());
+    GList *cur = stack;
+    while (cur) {
+        WnckWindow *window = (WnckWindow*) cur->data;
+
+        if (window != NULL) {
+            if (wnck_window_is_maximized(window)) {
+                // Check the window screen
+                int x, y, width, height;
+                wnck_window_get_geometry(window, &x, &y, &width, &height);
+                if (QApplication::desktop()->screenNumber(QRect(x, y, width, height).center()) == d->screen()) {
+                    topMostMaximizedWindowOnScreen = window;
+                }
+            }
+        }
+        cur = g_list_next(cur);
+    }
+
+    if (topMostMaximizedWindowOnScreen) {
+        wnck_window_activate(topMostMaximizedWindowOnScreen, CurrentTime);
+    }
+}
+
 void WindowHelper::close()
 {
     if (DashClient::instance()->activeInScreen(d->screen())) {
 
=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2012-05-24 11:18:30 +0000
+++ panel/applets/appname/windowhelper.h	2012-05-25 10:07:19 +0000
@@ -44,6 +44,8 @@
     bool isMaximized() const;
     bool isMostlyOnScreen(int screen) const;
 
+    void focusTopMostMaximizedWindowOnScreen() const;
+
 public Q_SLOTS:
     void close();
     void minimize();
 
=== modified file 'tests/manual-tests/panel.txt'
--- tests/manual-tests/panel.txt	2012-05-25 10:07:19 +0000
+++ tests/manual-tests/panel.txt	2012-05-25 10:07:19 +0000
@@ -58,8 +58,26 @@
  * Double click the panel in the monitor that does not contain the window
  * Verify the window stays maximized
 ----
-* Have two monitors
+ * 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
 ----
+ * Have two monitors
+ * Maximize one window in each monitor
+ * Give focus to windown in monitor 1
+ * Click in the panel of monitor 2 
+ * Verify the window from monitor 2 gets the focus
+----
+ * Have two monitors
+ * Maximize one window in each monitor
+ * Give focus to windown in monitor 1
+ * Press and drag the mouse in the panel of monitor 2 (has the window without focus)
+ * Verify the window from monitor 2 gets the focus and starts to be dragged
+----
+ * Have two windows in one monitor
+ * Maximize one window
+ * Give focus to unmaximized one
+ * Click in the panel (not in window label nor menus)
+ * Verify focus goes to the maximized window
+----