[gtk/file-chooser-fixes: 4/5] filechooser: Fix fallout from GtkText
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/file-chooser-fixes: 4/5] filechooser: Fix fallout from GtkText
- Date: Sat, 27 Mar 2021 13:58:02 +0000 (UTC)
commit e8a6b504f3d92b4e9407c82843c2c32c77c5b710
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Mar 27 09:54:20 2021 -0400
filechooser: Fix fallout from GtkText
Ever since the GtkText split, the focus is no longer
on an entry, but inside it. The filechooser was never
updated for that.
gtk/gtkfilechooserwidget.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index a666d55ca1..0349a4f6ca 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -5444,7 +5444,9 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser)
if (info.result == NULL && impl->location_entry)
goto file_entry;
}
- else if (impl->location_entry && current_focus == impl->location_entry)
+ else if (impl->location_entry &&
+ (current_focus == impl->location_entry ||
+ gtk_widget_is_ancestor (current_focus, impl->location_entry)))
{
gboolean is_well_formed, is_empty, is_file_part_empty, is_folder;
@@ -6230,7 +6232,9 @@ gtk_file_chooser_widget_should_respond (GtkFileChooserWidget *impl)
g_assert_not_reached ();
}
}
- else if ((impl->location_entry != NULL) && (current_focus == impl->location_entry))
+ else if ((impl->location_entry != NULL) &&
+ (current_focus == impl->location_entry ||
+ gtk_widget_is_ancestor (current_focus, impl->location_entry)))
{
GFile *file;
gboolean is_well_formed, is_empty, is_file_part_empty;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]