Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ public class Maps.MainWindow : Adw.ApplicationWindow {
};
search_res_popover.set_parent (search_entry);

search_entry.set_key_capture_widget (search_res_popover);

var style_submenu = new Menu ();
style_submenu.append (_("System"), "app.color-scheme('%s')".printf (Define.ColorScheme.DEFAULT));
style_submenu.append (_("Light"), "app.color-scheme('%s')".printf (Define.ColorScheme.FORCE_LIGHT));
Expand Down Expand Up @@ -162,6 +160,25 @@ public class Maps.MainWindow : Adw.ApplicationWindow {
}
});

var search_key_controller = new Gtk.EventControllerKey ();
search_key_controller.key_pressed.connect ((keyval, keycode, state) => {
switch (keyval) {
// Intercept space key so it's not used for list activation: https://github.com/elementary/maps/issues/150
case Gdk.Key.KP_Space:
case Gdk.Key.space:
search_key_controller.forward (search_entry.get_delegate ());
return Gdk.EVENT_STOP;
default:
// NOP
break;
}

return Gdk.EVENT_PROPAGATE;
});
((Gtk.Widget) search_res_popover).add_controller (search_key_controller);

search_entry.set_key_capture_widget (search_res_popover);

search_entry.search_changed.connect (() => {
if (search_entry.text == "") {
search_res_popover.popdown ();
Expand Down