diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-04-28 15:27:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-04-28 15:27:51 +0000 |
| commit | 7c15daf99ea0ce466c40d53c34118e4ac74d8c16 (patch) | |
| tree | e826ae1e1e9065b0374f511a094bba55ad3ea883 | |
| parent | 59fd48cee029af9039da5ef097123eeea84dbea3 (diff) | |
| parent | b9467a4dc72282374264d5be9017e40d53284aed (diff) | |
| download | gtk+-7c15daf99ea0ce466c40d53c34118e4ac74d8c16.tar.gz | |
Merge branch 'file-chooser-escape' into 'master'
file chooser: Prevent accidental search
Closes #1850
See merge request GNOME/gtk!784
| -rw-r--r-- | gtk/gtkfilechooserwidget.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 2e93cd334e..9dfe2e4976 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -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 */ |