diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-01-18 00:53:44 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2018-01-18 21:51:38 +0100 |
| commit | c4d2710c1c42714fd95e99f6f1e1627bfe8881e1 (patch) | |
| tree | a44e0c62bcd31b9a30de34d7608cb947435a6bf3 /vcl | |
| parent | c5ecb2990123d666dde0d66ce38dc3b9f03802c4 (diff) | |
Don't allow tearoff under Wayland
as floating toolbars aren't movable there.
Change-Id: I543344946f02d5a336ff738b4d6d9f9b21c595e9
Reviewed-on: https://gerrit.libreoffice.org/48096
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dockmgr.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index ed026a3fdf0d..7b7e3e52789f 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -799,7 +799,8 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin ImplPreparePopupMode(); // don't allow tearoff, if globally disabled - if( GetWindow()->GetType() == WindowType::TOOLBOX && ToolBox::AlwaysLocked() ) + if( !StyleSettings::GetDockingFloatsSupported() || + ( GetWindow()->GetType() == WindowType::TOOLBOX && ToolBox::AlwaysLocked() ) ) nFlags &= ~FloatWinPopupFlags::AllowTearOff; // if the subtoolbar was opened via keyboard make sure that key events |