Merge lp:~wingpanel-devs/slingshot/slingshot-dont-handle-super-space into lp:~elementary-pantheon/slingshot/trunk

Proposed by Marcus Wichelmann on 2016-01-16
Status: Merged
Approved by: Daniel Fore on 2016-01-16
Approved revision: 625
Merged at revision: 624
Proposed branch: lp:~wingpanel-devs/slingshot/slingshot-dont-handle-super-space
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 29 lines (+1/-11)
1 file modified
src/SlingshotView.vala (+1/-11)
To merge this branch: bzr merge lp:~wingpanel-devs/slingshot/slingshot-dont-handle-super-space
Reviewer Review Type Date Requested Status
Daniel Fore 2016-01-16 Needs Fixing on 2016-01-16
Review via email: mp+282825@code.launchpad.net

Commit message

Don't handle super+space shortcut

Description of the change

Ignore super+space shortcut because that's handled by wingpanel now.

To post a comment you must log in.
Daniel Fore (danrabbit) wrote :

Small regression here. Slingshot should also close with esc. It no longer does.

review: Needs Fixing
625. By Marcus Wichelmann on 2016-01-16

Keep on_key_press() call

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/SlingshotView.vala'
2--- src/SlingshotView.vala 2015-12-30 11:20:11 +0000
3+++ src/SlingshotView.vala 2016-01-16 01:08:20 +0000
4@@ -231,7 +231,7 @@
5 });
6
7 event_box.key_press_event.connect (on_key_press);
8- search_entry.key_press_event.connect (search_entry_key_press);
9+ search_entry.key_press_event.connect (on_key_press);
10 // Showing a menu reverts the effect of the grab_device function.
11 search_entry.search_changed.connect (() => {
12 if (modality != Modality.SEARCH_VIEW)
13@@ -302,16 +302,6 @@
14 }
15 }
16
17- // Handle super+space when the user is typing in the search entry
18- private bool search_entry_key_press (Gdk.EventKey event) {
19- if ((event.keyval == Gdk.Key.space) && ((event.state & Gdk.ModifierType.SUPER_MASK) != 0)) {
20- close_indicator ();
21- return true;
22- }
23-
24- return on_key_press (event);
25- }
26-
27 private void search_entry_activated () {
28 if (modality == Modality.SEARCH_VIEW) {
29 search_view.activate_selection ();

Subscribers

People subscribed via source and target branches