Merge lp:~aacid/unity-2d/unity-2d-shell_launcher_dash_focus_loss into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Make sure the qml view has the focus when invoking home

Fixes "Check focus goes to dash on Super when launcher menu is open"

[Gerry Boland (gerboland)]

Can you write a test for this please? If not automated, then manual.

review: Needs Fixing

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

954. By Albert Astals Cid on 2012-02-06

Merge

955. By Albert Astals Cid on 2012-02-06

Merge

956. By Albert Astals Cid on 2012-02-06

This test works now :-)

[Albert Astals Cid (aacid)]

Sorry, forgot to mention there was a test in the works. You've approved and it has been merged it already, now you can see the xtest → test

[Gerry Boland (gerboland)]

Ah perfect, approved!

review: Approve

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-06 12:07:47 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-06 12:31:06 +0000
@@ -264,6 +264,7 @@
         setDashActive(false);
         forceDeactivateWindow();
     } else {
+        setFocus();
         Q_EMIT activateHome();
     }
 }

=== modified file 'tests/places/places-tests.rb'
--- tests/places/places-tests.rb	2012-02-06 12:25:53 +0000
+++ tests/places/places-tests.rb	2012-02-06 12:31:06 +0000
@@ -294,7 +294,7 @@
   #   * None
   # References
   #   * None
-  xtest "Check focus goes to dash on Super when launcher menu is open" do
+  test "Check focus goes to dash on Super when launcher menu is open" do
     XDo::Keyboard.alt_F1
     verify_equal( 0, TIMEOUT, 'Launcher hiding when Alt+F1 pressed' ) {
       @app.Launcher()['x_absolute'].to_i