summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-03-10 01:12:08 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-03-21 10:56:55 +0000
commit519254aa32b5ad8a3ae8544d89f76884ab2f6afb (patch)
tree2b784dce63e172401d7aa229a7dd0f8a839b880f
parentd7500b1e563c9d15a784e6ee834bab3210d5faaa (diff)
gtk3: Keep menubar hidden after customization
... if it was hidden before. Otherwise it becomes out of sync with MenuBar::mbDisplayable. Change-Id: I4957f5cef916abfa54add2901b330463364d3dba Reviewed-on: https://gerrit.libreoffice.org/35486 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 807470ab1066..756cca26a498 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -847,7 +847,7 @@ void GtkSalMenu::SetFrame(const SalFrame* pFrame)
g_lo_menu_insert_section( pMenuModel, 0, nullptr, mpMenuModel );
#if GTK_CHECK_VERSION(3,0,0)
- if (!bUnityMode)
+ if (!bUnityMode && static_cast<MenuBar*>(mpVCLMenu.get())->IsDisplayable())
{
DestroyMenuBarWidget();
CreateMenuBarWidget();