diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-03-03 15:55:40 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-03-16 14:43:59 +0100 |
| commit | 33a066b518eadc06e481c35677f0224b47caefa2 (patch) | |
| tree | 974b8bb07f03e01679a37f0bb5e5b75385bf9a4c /include | |
| parent | 94df63a10521ebc04c577de8f9b1ba6f73034550 (diff) | |
tdf#106271 Cannot disable Menubar under Unity
Empty the global menu when the user wants to hide the menubar.
When showing it again, the global menu is refilled.
(cherry picked from commit f2fa5951bf3d02439a3e96d1f9d89962f0901edc)
The following commits have been squashed into this commit:
1.
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
(cherry-picked from commit 27f89f08cf4086802ce67f12389414bef6ab64ca)
2.
Don't use SetDisplayable when enabling Unity mode
because now it tracks the global menu too, but all we need
here is to hide the in-window menubar widget.
(cherry-picked from commit 3daa6c66eb9a4c334d6f72a8fd4bb09d7360a913)
Change-Id: I3c5e17100622cd8d22c4348cf90a76233dd0fd4c
Reviewed-on: https://gerrit.libreoffice.org/34919
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 449733a5c3b59c7b56db1db3dbc7fd0dcefd1a55)
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/menu.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 8b996df37bd6..e09289e451d3 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -478,6 +478,7 @@ public: // if the menubar is unattached an empty rectangle is returned Rectangle GetMenuBarButtonRectPixel( sal_uInt16 nId ); void RemoveMenuBarButton( sal_uInt16 nId ); + void LayoutChanged(); }; inline MenuBar& MenuBar::operator=( const MenuBar& rMenu ) |