diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-12-22 02:01:59 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-12-22 02:09:10 +0200 |
| commit | 2a4cd80abcf9e515d1ce3b3a944b573bdc42bff2 (patch) | |
| tree | e286b722a4b3a62941ace5bb4c1d413956ac6441 | |
| parent | c9303b98ad69213fe346d0657a8bca5ac8fa3bd7 (diff) | |
Fix ToolbarMenu position
Change-Id: I3a6380845687a809e155ebcf8ff8d3b2e5e6a4ec
| -rw-r--r-- | vcl/source/window/dockmgr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index ac587a6ec2ec..03938366dd07 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -968,11 +968,11 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin mpOldBorderWin = nullptr; // no border window found bool bAllowTearOff = bool( nFlags & FloatWinPopupFlags::AllowTearOff ); - bool bIsToolBox = GetWindow()->GetType() == WINDOW_TOOLBOX; + bool bUseStdPopup = bAllowTearOff && GetWindow()->GetType() != WINDOW_TOOLBOX; // the new parent for popup mode VclPtr<FloatingWindow> pWin; - if ( bAllowTearOff && !bIsToolBox ) + if ( bUseStdPopup ) pWin = VclPtr<FloatingWindow>::Create( mpParent, WB_STDPOPUP ); else pWin = VclPtr<ImplPopupFloatWin>::Create( mpParent, this, bAllowTearOff ); @@ -988,7 +988,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin GetWindow()->mpWindowImpl->mnBottomBorder = 0; // position toolbox below the drag grip - if ( bIsToolBox ) + if ( !bUseStdPopup ) GetWindow()->SetPosPixel( static_cast<ImplPopupFloatWin*>( pWin.get() )->GetToolboxPosition() ); // reparent borderwindow and window |