vcl/unx/gtk3/gtksalmenu.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 552ec69c9ed8ec44a90f1f387773d0229c4d623a Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jun 17 20:57:30 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jun 18 13:06:31 2021 +0200 gtk4: submenu-action should be good in 4.3.1 which fixes this problem and the greater problem of toplevel menubar menu items never changing state to become active https: //gitlab.gnome.org/GNOME/gtk/-/issues/3721 Change-Id: I72c13c1ad1089c8b2ca48bdb6c35748c756bc931 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117411 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx index e9e6508ef407..78e1b7d6ffa3 100644 --- a/vcl/unx/gtk3/gtksalmenu.cxx +++ b/vcl/unx/gtk3/gtksalmenu.cxx @@ -431,8 +431,7 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const tools::Rectangl GtkWidget *pWidget = gtk_menu_new_from_model(mpMenuModel); gtk_menu_attach_to_widget(GTK_MENU(pWidget), mpFrame->getMouseEventWidget(), nullptr); #else - // TODO: gtk_popover_menu_new crashes on submenus with: "signal 'action-added' is invalid for instance of type 'GtkActionMuxer'" - GtkWidget *pWidget = gtk_popover_menu_new_from_model_full(mpMenuModel, GTK_POPOVER_MENU_NESTED); + GtkWidget *pWidget = gtk_popover_menu_new_from_model(mpMenuModel); gtk_widget_set_parent(pWidget, mpFrame->getMouseEventWidget()); gtk_popover_set_has_arrow(GTK_POPOVER(pWidget), false); #endif _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
