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

[Albert Astals Cid]

[Spread] If there is only one window in the spread workspace activate it too

This might seem not needed since why activate window if it's the only one in the workspace, but we can apply filters to the spread workspaces so it might not be the only window in the real windowmanager workspace

If there is only one window in the spread workspace activate it too

This might seem not needed since why activate window if it's the only one in the workspace, but we can apply filters to the spread workspaces so it might not be the only window in the real windowmanager workspace
UNBLOCK

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/265/console reported an error when processing this lp:~aacid/unity-2d/spread_focus branch.
Not merging it.

=== modified file 'spread/Windows.qml'
--- spread/Windows.qml	2012-03-06 10:04:20 +0000
+++ spread/Windows.qml	2012-04-17 08:24:19 +0000
@@ -101,6 +101,7 @@
     delegate:
         Item {
             id: cell
+            property alias windowItem: spreadWindow
 
             ScaledItem {
                 id: scaledCell

=== modified file 'spread/Workspace.qml'
--- spread/Workspace.qml	2012-03-06 10:04:20 +0000
+++ spread/Workspace.qml	2012-04-17 08:24:19 +0000
@@ -163,10 +163,18 @@
     }
 
     function setFocusOnFirstWindow() {
+        if (windows.currentIndex == 0) {
+            // This way we make sure currentItem is updated
+            windows.currentIndex = -1
+        }
         windows.currentIndex = 0
     }
 
     function setFocusOnLastWindow() {
         windows.currentIndex = windows.count - 1
     }
+
+    function currentWindow() {
+        return windows.currentItem.windowItem
+    }
 }

=== modified file 'spread/Workspaces.qml'
--- spread/Workspaces.qml	2012-03-13 13:59:57 +0000
+++ spread/Workspaces.qml	2012-04-17 08:24:19 +0000
@@ -163,7 +163,11 @@
                 if (zoomedWorkspace == workspaceNumber) {
                     activateWorkspace(workspaceNumber)
                 } else if (zoomedWorkspace == -1) {
-                    if (windowCount <= 1) {
+                    if (windowCount == 1) {
+                        zoomedWorkspace = workspaceNumber
+                        workspace.setFocusOnFirstWindow()
+                        activateWindow(workspace.currentWindow().windowInfo)
+                    } else if (windowCount < 1) {
                         activateWorkspace(workspaceNumber)
                     } else {
                         workspaces.currentIndex = index

=== modified file 'tests/manual-tests/window-manager.txt'
--- tests/manual-tests/window-manager.txt	2012-03-13 15:18:52 +0000
+++ tests/manual-tests/window-manager.txt	2012-04-17 08:24:19 +0000
@@ -11,3 +11,15 @@
     -> Pressing Esc closes spreads on all monitors
     -> Selecting a window in a spread closes the others
 ----
+
+ * Open a Nautilus window in Workspace 1
+ * Open a Firefox window in Workspace 1
+ * Make the Firefox window be on top of the Nautilus one
+ * Switch to Workspace 2
+ * Open a Nautilus window in Workspace 2
+ * Press the Nautilus tile in the launcher
+ * Verify the spread appears with just the two Nautilus windows
+ * Click on the first workspace in the spread chooser
+ * Verify the current workspace is Workspace 1
+ * Verify the Nautilus window is the one with the focus
+----