diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2022-07-15 11:18:07 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-07-25 10:37:14 +0200 |
| commit | 7edadf64047b367f8d9cc0031008d6c6b46a55fd (patch) | |
| tree | f308b25d9cf35f8fa5c1626cc0e0ae719476a9cc | |
| parent | fd948aed2230e50cce9c4aa7f1eb30e7cc8c4f8f (diff) | |
Resolves tdf#143688 - Allow detaching of sub-toolbars when locked
Change-Id: I36669d953eb9438df73256676e2dfbfe3c263031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137100
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit db26f712e1edfef6b61a324b146310be00aeb100)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137174
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | vcl/source/window/dockmgr.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index e71c7f420580..f836ff2f1cef 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -813,8 +813,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin ImplPreparePopupMode(); // don't allow tearoff, if globally disabled - if( !StyleSettings::GetDockingFloatsSupported() || - ( GetWindow()->GetType() == WindowType::TOOLBOX && ToolBox::AlwaysLocked() ) ) + if( !StyleSettings::GetDockingFloatsSupported() ) nFlags &= ~FloatWinPopupFlags::AllowTearOff; // if the subtoolbar was opened via keyboard make sure that key events |