diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-03 11:18:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-03 14:12:25 +0000 |
| commit | 19ce5fa563f30a9147c0d3d903a5c556062a73be (patch) | |
| tree | 18f3563f9c9c27c67ef76c7518b01035559c9a52 /vcl | |
| parent | 36cf76c7e98fb6a16980efb1ac801c8d0d99996b (diff) | |
WB_PINABLE isn't set anywhere
Change-Id: I6acc4b9dc87dd6023b5ad7013bc27180d6e0db6c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 19 | ||||
| -rw-r--r-- | vcl/source/window/dockmgr.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 2 |
3 files changed, 3 insertions, 20 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index f66664a1f1df..94c64f52249d 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1424,20 +1424,10 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh if ( pData->mnTitleType & (BorderWindowTitleType::Normal | BorderWindowTitleType::Small) ) { - long nLeft = pData->maTitleRect.Left() + 1; long nRight = pData->maTitleRect.Right() - 3; long const nItemTop = pData->maTitleRect.Top() + 2; long const nItemBottom = pData->maTitleRect.Bottom() - 2; - auto addOnLeft = [&nLeft, nItemTop, nItemBottom]( - Rectangle & rect, long width, long gap) - { - rect.Top() = nItemTop; - rect.Bottom() = nItemBottom; - rect.Left() = nLeft; - rect.Right() = rect.Left() + width; - nLeft += rect.GetWidth() + gap; - }; auto addSquareOnRight = [&nRight, nItemTop, nItemBottom]( Rectangle & rect, long gap) { @@ -1448,13 +1438,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh nRight -= rect.GetWidth() + gap; }; - if ( pBorderWindow->GetStyle() & WB_PINABLE ) - { - Image aImage; - ImplGetPinImage( DrawButtonFlags::NONE, false, aImage ); - addOnLeft(pData->maPinRect, aImage.GetSizePixel().Width(), 3); - } - if ( pBorderWindow->GetStyle() & WB_CLOSEABLE ) { addSquareOnRight(pData->maCloseRect, 3); @@ -1710,7 +1693,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent, { // remove all unwanted WindowBits WinBits nOrgStyle = nStyle; - WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_PINABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP); + WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP); if ( nTypeStyle & BorderWindowStyle::App ) nTestStyle |= WB_APP; nStyle &= nTestStyle; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 03938366dd07..e467e2584ff1 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -36,7 +36,7 @@ #include <vcl/unowrap.hxx> #include <vcl/settings.hxx> -#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE ) +#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_ROLLABLE ) class ImplDockFloatWin2 : public FloatingWindow { diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 67c67c0a7a3d..dd97368b31be 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -34,7 +34,7 @@ #include <brdwin.hxx> #include <salframe.hxx> -#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE ) +#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_ROLLABLE ) class DockingWindow::ImplData { |