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

[Albert Astals Cid]

[Dash] Really give the focus to the search entry on lens change

[Dash] Really give the focus to the search entry on lens change

[lp:~aacid/unity-2d/dashlossfocusbug]

1049. By Albert Astals Cid on 2012-04-05

Move the focus earlier so we don't need a forceActiveFocus call

1050. By Albert Astals Cid on 2012-04-05

Give the focus too if we are using the custom Home.qml hack

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-04-04 10:16:36 +0000
+++ shell/dash/Dash.qml	2012-04-05 13:28:19 +0000
@@ -87,9 +87,6 @@
     }
 
     function activatePage(page) {
-        /* Always give the focus to the search entry when switching pages */
-        search_entry.focus = true
-
         if (page == currentPage) {
             return
         }
@@ -102,6 +99,9 @@
     }
 
     function buildLensPage(lens) {
+        /* Always give the focus to the search entry when switching pages */
+        search_entry.focus = true
+
         pageLoader.setSource("LensView.qml")
         /* Take advantage of the fact that the loaded qml is local and setting
            the source loads it immediately making pageLoader.item valid */
@@ -169,6 +169,10 @@
             for (var i=0; i<lenses.rowCount(); i++) {
                 lenses.get(i).viewType = Lens.Hidden
             }
+
+            /* Give the focus to the search entry when switching pages */
+            search_entry.focus = true
+
             pageLoader.setSource("Home.qml")
             /* Take advantage of the fact that the loaded qml is local and setting
                the source loads it immediately making pageLoader.item valid */

=== modified file 'tests/dash/dash-tests.rb'
--- tests/dash/dash-tests.rb	2012-04-03 08:34:46 +0000
+++ tests/dash/dash-tests.rb	2012-04-05 13:28:19 +0000
@@ -541,4 +541,47 @@
       @app.TextCustom( { :objectName => "noResultsText" } )
     }
   end
+
+  # Test case objectives:
+  #   * Check focus goes to the search bar on lens switch
+  # Pre-conditions
+  # Test steps
+  #   * Invoke dash
+  #   * Verify dash shows
+  #   * Verify search entry has focus
+  #   * Change to the second lens (clicking on it)
+  #   * Press key down
+  #   * Verify search entry does not have focus
+  #   * Change to the first lens (clicking on it)
+  #   * Verify search entry does has focus
+  # Post-conditions
+  #   * None
+  # References
+  #   * https://bugs.launchpad.net/unity-2d/+bug/974235
+  test "Check focus goes to the search bar on lens switch" do
+    XDo::Keyboard.super
+
+    verify_equal("true", TIMEOUT, 'There should be a Dash declarative view after pressing Super') {
+      @app.Dash()['active']
+    }
+
+    verify_equal("true", TIMEOUT, 'Search entry should have focus after starting') {
+        @app.Dash().SearchEntry()['activeFocus']
+    }
+
+    buttons = @app.LensBar().children( { :type => "LensButton" } )
+    buttons[1].move_mouse
+    buttons[1].tap
+    XDo::Keyboard.down
+    verify_equal("false", TIMEOUT, 'Search entry should not have focus after key down') {
+        @app.Dash().SearchEntry()['activeFocus']
+    }
+    buttons[0].move_mouse
+    buttons[0].tap
+    verify_equal("true", TIMEOUT, 'Search entry should have focus after lens change') {
+        @app.Dash().SearchEntry()['activeFocus']
+    }
+
+  end
+
 end