Merge lp:~stolowski/unity-2d/dash-hud-esc-handling-fix into lp:unity-2d

[Paweł Stołowski]

[dash][hud] Hitting Escape clears search query first. Hitting Escape with empty search query closes Dash/Hud. This makes Esc behavior consistent with Unity.

[dash][hud] Hitting Escape clears search query first. Hitting Escape with empty search query closes Dash/Hud. This makes Esc behavior consistent with Unity.
  - Modified SearchEntry keyboard handling to clear input text on Escape and accept key event.
  - Modified Dash and Hud keyboard handling to close the view only if search query is empty.

[Albert Astals Cid (aacid)]

Seems to me you don't need all the extra code in Shell.qml nor Hud.qml since you are already eating the event and it won't get propagated unless the text is already "", no?

review: Needs Fixing

[lp:~stolowski/unity-2d/dash-hud-esc-handling-fix]

1033. By Paweł Stołowski on 2012-04-03

The chnages to Shell and Hud qml are not needed since SearchEntry accepts Esc key event if search text was not empty. Removed.

[Albert Astals Cid (aacid)]

Works great :-)

review: Approve

=== modified file 'shell/common/SearchEntry.qml'
--- shell/common/SearchEntry.qml	2012-03-13 11:24:33 +0000
+++ shell/common/SearchEntry.qml	2012-04-03 10:19:19 +0000
@@ -114,6 +114,12 @@
                     activateFirstResult()
                     event.accepted = true;
                 }
+                if (event.key == Qt.Key_Escape) {
+                    if (searchInput.text != "") {
+                        searchInput.text = ""
+                        event.accepted = true;
+                    }
+                }
             }
 
             Component {

=== modified file 'tests/dash/dash-tests.rb'
--- tests/dash/dash-tests.rb	2012-03-20 18:01:52 +0000
+++ tests/dash/dash-tests.rb	2012-04-03 10:19:19 +0000
@@ -381,6 +381,59 @@
   end
 
   # Test case objectives:
+  #   * Check that Esc clears dash search entry first, tapping Esc for the 2nd time closes dash
+  # Pre-conditions
+  #   * Desktop with no running applications
+  # Test steps
+  #   * Verify dash is not showing
+  #   * Press Super
+  #   * Verify dash is showing
+  #   * Type search query
+  #   * Verify dash search entry is populated
+  #   * Press Esc
+  #   * Verify dash search entry is cleared
+  #   * Verify dash is still showing
+  #   * Press Esc
+  #   * Verify dash is not showing
+  # Post-conditions
+  #   * None
+  # References
+  #   * https://bugs.launchpad.net/unity-2d/+bug/966121
+  test "Esc clears dash search query first, then closes dash" do
+    verify_equal("false", TIMEOUT, 'There should not be a Dash declarative view on startup') {
+      @app.Dash()['active']
+    }
+
+    XDo::Keyboard.super
+    verify_equal("true", TIMEOUT, 'There should be a Dash declarative view after pressing Super') {
+      @app.Dash()['active']
+    }
+
+    # type search string
+    XDo::Keyboard.a
+    XDo::Keyboard.b
+    XDo::Keyboard.c
+    
+    verify_equal('abc', TIMEOUT, 'Search query should be populated') {
+      @app.Dash().QDeclarativeItem.SearchEntry()['searchQuery']
+    }
+
+    XDo::Keyboard.escape
+    verify_equal("true", TIMEOUT, 'Dash should still be visible') {
+      @app.Dash()['active']
+    }
+
+    verify_equal('', TIMEOUT, 'Search query should be empty') {
+      @app.Dash().QDeclarativeItem.SearchEntry()['searchQuery']
+    }
+
+    XDo::Keyboard.escape
+    verify_equal("false", TIMEOUT, 'There should not be a Dash declarative') {
+      @app.Dash()['active']
+    }
+  end
+ 
+  # Test case objectives:
   #   * Check navigation to and in lens bar
   # Pre-conditions
   # Test steps

=== modified file 'tests/hud/hud_show_hide_tests.rb'
--- tests/hud/hud_show_hide_tests.rb	2012-04-01 09:26:54 +0000
+++ tests/hud/hud_show_hide_tests.rb	2012-04-03 10:19:19 +0000
@@ -128,6 +128,58 @@
   end
  
   # Test case objectives:
+  #   * Check Escape key clears search query first, then closes HUD
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Check HUD closed
+  #   * Tap the Alt key
+  #   * Check HUD open
+  #   * Type search string
+  #   * Verify that search string appears in the HUD
+  #   * Tap Escape key
+  #   * Verify that search string was cleared
+  #   * Tap Escape key
+  #   * Check that HUD was closed
+  # Post-conditions
+  #   * None
+  # References
+  #   * https://bugs.launchpad.net/unity-2d/+bug/966121
+  test "Esc clears HUD search query, then hides HUD" do
+    verify_not(1, 'HUD should be hidden at startup') {
+      @app.Hud()
+    }
+
+    XDo::Keyboard.alt
+    verify_equal('true', TIMEOUT, 'HUD should be visible, as the Alt key was tapped') {
+      @app.Hud()['active']
+    }
+
+    # type search string
+    XDo::Keyboard.a
+    XDo::Keyboard.b
+    XDo::Keyboard.c
+
+    verify_equal('abc', TIMEOUT, 'HUD search text should be "abc"') {
+        @app.Hud().SearchEntry()['searchQuery']
+    }
+
+    XDo::Keyboard.escape
+    verify_equal('true', TIMEOUT, 'HUD should still be visible') {
+      @app.Hud()['active']
+    }
+
+    verify_equal('', TIMEOUT, 'HUD search text should be empty') {
+        @app.Hud().SearchEntry()['searchQuery']
+    }
+
+    XDo::Keyboard.escape
+    verify_not(1, 'HUD should be hidden, as the Escape key should dismiss it') {
+      @app.Hud()
+    }
+  end
+
+  # Test case objectives:
   #   * Check Alt+F4 key closes HUD
   # Pre-conditions
   #   * None