summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-10-04 16:16:42 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-05 10:13:04 +0100
commit079396f5a2909e479a0a8652b16bec6a99674914 (patch)
tree5f032c47ed701297d8b57ef914d896aa8214139d /meta/recipes-gnome
parent5f6a62c53f68fb6eb1ab31c43c4c88806dcaa03e (diff)
downloadpoky-079396f5a2909e479a0a8652b16bec6a99674914.tar.gz
gtk+3: Backport treeview focus fix
Treeview did not grab focus properly on mouse click, leading to e.g. multifile selection with click/shift-click not working in the filechooser. Backport a fix. Fixes [YOCTO #10273]. (From OE-Core rev: d408b79dba47e4392a9d13aff1660a1e483a765c) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch39
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb1
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch
new file mode 100644
index 0000000000..e819add889
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch
@@ -0,0 +1,39 @@
1Upstream-Status: Backport [29faa2db]
2Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
3
4
5From 29faa2db44b04b9cf7f4d96e32691f424490c730 Mon Sep 17 00:00:00 2001
6From: Matthias Clasen <mclasen@redhat.com>
7Date: Sun, 11 Sep 2016 11:47:55 -0400
8Subject: [PATCH] Redo focus handling in treeview once more
9
10The fix for bug 767468 had some unintended side-effects. This is
11an attempt at doing the same fix (don't grab focus when we are
12grab-shadowed), while avoiding the breakage, by using GTK+'s
13internal tracking for grab-shadowed-ness.
14
15https://bugzilla.gnome.org/show_bug.cgi?id=770508
16---
17 gtk/gtktreeview.c | 3 +--
18 1 file changed, 1 insertion(+), 2 deletions(-)
19
20diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
21index 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--
382.9.3
39
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb b/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
index 9a0bfc4ba6..38e095ab9f 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
@@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ 7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
8 file://0003-Add-disable-opengl-configure-option.patch \ 8 file://0003-Add-disable-opengl-configure-option.patch \
9 file://0004-configure.ac-Fix-wayland-protocols-path.patch \ 9 file://0004-configure.ac-Fix-wayland-protocols-path.patch \
10 file://0001-Redo-focus-handling-in-treeview-once-more.patch \
10 " 11 "
11SRC_URI[md5sum] = "cc76cac5e18c772c6784bf19a3dff08b" 12SRC_URI[md5sum] = "cc76cac5e18c772c6784bf19a3dff08b"
12SRC_URI[sha256sum] = "83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17" 13SRC_URI[sha256sum] = "83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17"