AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'file-chooser-escape' into 'master'

Browse Source 
file chooser: Prevent accidental search

Closes #1850

See merge request GNOME/gtk!784
This commit is contained in:
Matthias Clasen 2019-04-28 15:27:51 +00:00
commit 7c15daf99e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkfilechooserwidget.c
View File

@ -363,6 +363,7 @@ struct _GtkFileChooserWidgetPrivate {
guint show_size_column : 1;
guint create_folders : 1;
guint auto_selecting_first_row : 1;
guint starting_search : 1;
};
#define MAX_LOADING_TIME 500
@ -1411,9 +1412,11 @@ widget_key_press_cb (GtkEventControllerKey *controller,
}
else
{
priv->starting_search = TRUE;
if (gtk_event_controller_key_forward (controller, priv->search_entry))
{
if (priv->operation_mode != OPERATION_MODE_SEARCH)
if (priv->operation_mode != OPERATION_MODE_SEARCH &&
priv->starting_search)
operation_mode_set (impl, OPERATION_MODE_SEARCH);
handled = TRUE;
@ -7252,6 +7255,8 @@ search_entry_stop_cb (GtkFileChooserWidget *impl)
search_stop_searching (impl, FALSE);
else
g_object_set (impl, "search-mode", FALSE, NULL);
impl->priv->starting_search = FALSE;
}
/* Hides the path bar and creates the search entry */