vcl/unx/gtk3/gtksalmenu.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 241619128c5620dbde4004c83a8d64d2a593a37a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 12 17:04:46 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 12 21:28:23 2021 +0200
gtk4: allow cursoring to move through menus
oddly right arrow works, but left arrow seems to get stuck and pass
focus into the main window sometimes, but get this partially working
anyway
Change-Id: I3aca1b8f25bdda5684ce7124b8564233e40d9f1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123528
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 5ad80816cded..9e7d9edf050f 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1002,12 +1002,12 @@ void GtkSalMenu::CreateMenuBarWidget()
#if !GTK_CHECK_VERSION(4, 0, 0)
mpMenuAllowShrinkWidget = gtk_scrolled_window_new(nullptr, nullptr);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(mpMenuAllowShrinkWidget),
GTK_SHADOW_NONE);
+ // tdf#129634 don't allow this scrolled window as a candidate to tab into
+ gtk_widget_set_can_focus(GTK_WIDGET(mpMenuAllowShrinkWidget), false);
#else
mpMenuAllowShrinkWidget = gtk_scrolled_window_new();
gtk_scrolled_window_set_has_frame(GTK_SCROLLED_WINDOW(mpMenuAllowShrinkWidget),
false);
#endif
- // tdf#129634 don't allow this scrolled window as a candidate to tab into
- gtk_widget_set_can_focus(GTK_WIDGET(mpMenuAllowShrinkWidget), false);
// tdf#116290 external policy on scrolledwindow will not show a scrollbar,
// but still allow scrolled window to not be sized to the child content.
// So the menubar can be shrunk past its nominal smallest width.
