diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-09-05 01:56:19 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-06 07:31:52 +0000 |
| commit | bc57ca9d6dc107fd0dcdfcb844ca8b937624281e (patch) | |
| tree | 8ba98fe72b356e61427d6c9169d16ca339c77308 | |
| parent | editeng: don't let wild-card auto-correct leave current word (diff) | |
| download | core-bc57ca9d6dc107fd0dcdfcb844ca8b937624281e.tar.gz core-bc57ca9d6dc107fd0dcdfcb844ca8b937624281e.zip | |
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 873ce396d44e..2980ac06b06d 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); } } |