Commit 86eefc76 authored by Matthias Clasen's avatar Matthias Clasen

file chooser: Make Escape go out of search mode

This works in most other places where we have search,
and is the expected behavior.
parent 1d64175c
......@@ -527,6 +527,7 @@ static void search_clear_model (GtkFileChooserWidget *impl,
static gboolean search_should_respond (GtkFileChooserWidget *impl);
static GSList *search_get_selected_files (GtkFileChooserWidget *impl);
static void search_entry_activate_cb (GtkFileChooserWidget *impl);
static void search_entry_stop_cb (GtkFileChooserWidget *impl);
static void settings_load (GtkFileChooserWidget *impl);
static void show_filters (GtkFileChooserWidget *impl,
......@@ -6257,6 +6258,12 @@ search_entry_activate_cb (GtkFileChooserWidget *impl)
search_start_query (impl, text);
}
static void
search_entry_stop_cb (GtkFileChooserWidget *impl)
{
operation_mode_set (impl, OPERATION_MODE_BROWSE);
}
/* Hides the path bar and creates the search entry */
static void
search_setup_widgets (GtkFileChooserWidget *impl)
......@@ -7425,6 +7432,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
gtk_widget_class_bind_template_callback (widget_class, places_sidebar_show_error_message_cb);
gtk_widget_class_bind_template_callback (widget_class, places_sidebar_show_enter_location_cb);
gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb);
gtk_widget_class_bind_template_callback (widget_class, search_entry_stop_cb);
}
static void
......
......@@ -131,6 +131,7 @@
<property name="visible">True</property>
<property name="hexpand">True</property>
<signal name="search-changed" handler="search_entry_activate_cb" swapped="yes"/>
<signal name="stop-search" handler="search_entry_stop_cb" swapped="yes"/>
</object>
</child>
</object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment