diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-10-09 21:13:25 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-12-20 17:13:45 +0100 |
| commit | 861086a21449acb168e52e4eab606692200d2622 (patch) | |
| tree | be5f0e8ab4f48949392632ab3802ee557d8e2757 /vcl | |
| parent | 8af88c48060d2b07255793c9be65f4d085b7b48b (diff) | |
Related: tdf#79657 Different approach to disable the context menu
... in the overflow toolbar. Using ToolBoxMenuType::NONE
is wrong as it might affect the layout. Can be easily triggered
here by adding FloatWinPopupFlags::GrabFocus to StartPopupMode
(which likely will be needed to fully solve tdf#79657).
Another case was fixed in 91053763a7189c8ac03a59dc996e6333404f846e
("Fix sub-toolbar tearoff for .uno:ChooseControls"), but without
providing a solution for the context menu.
Change-Id: I4a0b4560fe49106613fa2337b5dd83eb7fa29f47
Reviewed-on: https://gerrit.libreoffice.org/46837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c636b4023be0..f181da0a99d9 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1718,7 +1718,7 @@ IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu, void*, void) void ToolBox::ExecuteCustomMenu( const tools::Rectangle& rRect ) { - if( IsMenuEnabled() ) + if ( IsMenuEnabled() && !ImplIsInPopupMode() ) { UpdateCustomMenu(); // handle custom menu asynchronously |