[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtksalmenu.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 65508049523ac7a257688fffcbc1ad3711986421
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 20 10:59:39 2019 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 20 21:51:44 2019 +0100

    honour MenuFlags::AlwaysShowDisabledEntries for native gtk menus
    
    Change-Id: I3d26320061f3da01e9b857cb3dad277f3d7aa4f5
    Reviewed-on: https://gerrit.libreoffice.org/83324
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 301322d8c78d..db0480e3040e 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -386,7 +386,14 @@ void GtkSalMenu::Update()
     const GtkSalMenu* pMenu = this;
     while (pMenu->mpParentSalMenu)
         pMenu = pMenu->mpParentSalMenu;
-    ImplUpdate(false, !pMenu->mbMenuBar);
+
+    bool bAlwaysShowDisabledEntries;
+    if (pMenu->mbMenuBar)
+        bAlwaysShowDisabledEntries = true;
+    else
+        bAlwaysShowDisabledEntries = bool(mpVCLMenu->GetMenuFlags() & 
MenuFlags::AlwaysShowDisabledEntries);
+
+    ImplUpdate(false, !bAlwaysShowDisabledEntries);
 }
 
 static void MenuPositionFunc(GtkMenu* menu, gint* x, gint* y, gboolean* 
push_in, gpointer user_data)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits