vcl/source/window/dockmgr.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit c4d2710c1c42714fd95e99f6f1e1627bfe8881e1 Author: Maxim Monastirsky <momonas...@gmail.com> Date: Thu Jan 18 00:53:44 2018 +0200 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 <c...@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonas...@gmail.com> 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits