From 65508049523ac7a257688fffcbc1ad3711986421 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 20 Nov 2019 10:59:39 +0000
Subject: honour MenuFlags::AlwaysShowDisabledEntries for native gtk menus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I3d26320061f3da01e9b857cb3dad277f3d7aa4f5
Reviewed-on: https://gerrit.libreoffice.org/83324
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 vcl/unx/gtk3/gtk3gtksalmenu.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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)
-- 
cgit