vcl/unx/gtk/gtksalmenu.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit bc57ca9d6dc107fd0dcdfcb844ca8b937624281e
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Mon Sep 5 01:56:19 2016 +0300
tdf#101471 Unity: make sure vcl menu is hidden
MenuBar::SetDisplayable happens to be called before
GtkSalMenu::EnableUnity(true) under gtk2, which leaves the vcl
menu visible (but not painted completely). Solve this by calling
SetDisplayable from inside EnableUnity, as it was before
800704e0c46f6f86f6a18a477ba4b6f313c5693a.
Note that calling SetDisplayable has a side effect of disabling
of menubar keyboard events, but we don't care about that,
because Unity menu is outside the application anyway.
Change-Id: I3948d5b57b1df480cee4fb962a5dc6b63a849b15
Reviewed-on: https://gerrit.libreoffice.org/28676
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 873ce39..2980ac0 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -1085,6 +1085,7 @@ void GtkSalMenu::EnableUnity(bool bEnable)
else
DestroyMenuBarWidget();
bUnityMode = bEnable;
+ static_cast<MenuBar*>(mpVCLMenu)->SetDisplayable(!bEnable);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
