From d45d8ae3c51606eb1d9e63396a0eab13c8742907 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 8 Sep 2016 16:36:59 +0100 Subject: Resolves: tdf#101881 gtk3 3.18 menubar doesn't grab keyboard... the same way gtk3 3.20 does with gtk_grab_add, so on gtk_menu_shell_deselect the keyboard focus doesn't remain in the menubar. bisecting gtk itself I find... commit 5cbbb90e311d95192d1b68ba89c3190cdb652868 Author: Carlos Garnacho Date: Thu Nov 26 19:54:31 2015 +0100 GtkCellRendererAccel: Use gdk_seat_grab() https://bugzilla.gnome.org/show_bug.cgi?id=759309 is the commit that makes it do what I want, so add an extra gtk_grab_add/gtk_grab_remove around our entry and exit of the menubar Change-Id: I5bf09834b4e1a14d30403208d03b3abd28a382a8 --- vcl/inc/unx/gtk/gtksalmenu.hxx | 1 + 1 file changed, 1 insertion(+) (limited to 'vcl/inc') diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index b6c1042c5336..48e937324ae0 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -48,6 +48,7 @@ private: bool mbMenuBar; bool mbNeedsUpdate; bool mbReturnFocusToDocument; + bool mbAddedGrab; GtkWidget* mpMenuBarContainerWidget; GtkWidget* mpMenuBarWidget; GtkWidget* mpCloseButton; -- cgit