diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-03-07 18:55:30 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-03-07 19:18:46 +0200 |
commit | 27f89f08cf4086802ce67f12389414bef6ab64ca (patch) | |
tree | 417d21b42943e1486e82b8e919b706a71ba734b0 /vcl/unx/gtk | |
parent | 94509163e8690351f47bb32eaff6ace14b1b808a (diff) |
Destroy menu widget when enabling Unity integration
Like GtkSalMenu::ShowMenuBar did before
f2fa5951bf3d02439a3e96d1f9d89962f0901edc
("tdf#106271 Cannot disable Menubar under Unity")
Should fix https://lists.freedesktop.org/archives/libreoffice/2017-
March/077225.html
Change-Id: I08e7486784d73f9fe1da4b21c54ac2913a8316b4
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 1c23cde891a5..1b5481b9ad91 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -1155,8 +1155,11 @@ void GtkSalMenu::EnableUnity(bool bEnable) { if (bUnityMode != bEnable) { - bUnityMode = bEnable; static_cast<MenuBar*>(mpVCLMenu.get())->SetDisplayable(!bEnable); + bUnityMode = bEnable; + + if (!bEnable) + ShowMenuBar(true); } } |