| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 1 | Upstream-Status: Backport [29faa2db] |
| 2 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | |
| 4 | |
| 5 | From 29faa2db44b04b9cf7f4d96e32691f424490c730 Mon Sep 17 00:00:00 2001 |
| 6 | From: Matthias Clasen <mclasen@redhat.com> |
| 7 | Date: Sun, 11 Sep 2016 11:47:55 -0400 |
| 8 | Subject: [PATCH] Redo focus handling in treeview once more |
| 9 | |
| 10 | The fix for bug 767468 had some unintended side-effects. This is |
| 11 | an attempt at doing the same fix (don't grab focus when we are |
| 12 | grab-shadowed), while avoiding the breakage, by using GTK+'s |
| 13 | internal tracking for grab-shadowed-ness. |
| 14 | |
| 15 | https://bugzilla.gnome.org/show_bug.cgi?id=770508 |
| 16 | --- |
| 17 | gtk/gtktreeview.c | 3 +-- |
| 18 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c |
| 21 | index a7463cc..73d3557 100644 |
| 22 | --- a/gtk/gtktreeview.c |
| 23 | +++ b/gtk/gtktreeview.c |
| 24 | @@ -3050,11 +3050,10 @@ static void |
| 25 | grab_focus_and_unset_draw_keyfocus (GtkTreeView *tree_view) |
| 26 | { |
| 27 | GtkWidget *widget = GTK_WIDGET (tree_view); |
| 28 | - GtkWidget *grab_widget = gtk_grab_get_current (); |
| 29 | |
| 30 | if (gtk_widget_get_can_focus (widget) && |
| 31 | !gtk_widget_has_focus (widget) && |
| 32 | - (!grab_widget || grab_widget == widget)) |
| 33 | + !_gtk_widget_get_shadowed (widget)) |
| 34 | gtk_widget_grab_focus (widget); |
| 35 | |
| 36 | tree_view->priv->draw_keyfocus = 0; |
| 37 | -- |
| 38 | 2.9.3 |
| 39 | |