[Libreoffice-commits] core.git: 7 commits - include/tools include/vcl vcl/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Jan 3 14:12:57 UTC 2017
include/tools/wintypes.hxx | 1
include/vcl/dockwin.hxx | 2
include/vcl/syswin.hxx | 4 -
vcl/inc/brdwin.hxx | 5 -
vcl/inc/svdata.hxx | 1
vcl/inc/svids.hrc | 4 -
vcl/source/app/svmain.cxx | 5 -
vcl/source/src/helptext.src | 5 -
vcl/source/src/images.src | 5 -
vcl/source/window/brdwin.cxx | 137 ------------------------------------------
vcl/source/window/dockmgr.cxx | 5 -
vcl/source/window/dockwin.cxx | 5 -
vcl/source/window/syswin.cxx | 11 ---
13 files changed, 4 insertions(+), 186 deletions(-)
New commits:
commit 1b5e144b4ed0e276d6485ece6d3d2b0b10f9bbf8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 3 11:38:20 2017 +0000
SetPin and IsPinned are in an always-false circular isolated relationship
Change-Id: I4fb3aaa8a5e8c62091fbc542deae6af3a113a608
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index f394616..aa5dced 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -102,7 +102,6 @@ private:
mbDocking:1,
mbLastFloatMode:1,
mbStartFloat:1,
- mbPinned:1,
mbRollUp:1,
mbDockBtn:1,
mbHideBtn:1,
@@ -231,7 +230,6 @@ private:
mbDragFull:1,
mbLastFloatMode:1,
mbStartFloat:1,
- mbPinned:1,
mbRollUp:1,
mbDockBtn:1,
mbHideBtn:1,
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 2253484..971cd60 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -155,7 +155,6 @@ private:
Size maOrgSize;
Size maRollUpOutSize;
Size maMinOutSize;
- bool mbPinned;
bool mbRollUp;
bool mbRollFunc;
bool mbDockBtn;
@@ -216,9 +215,6 @@ public:
void ShowTitleButton( TitleButton nButton, bool bVisible );
bool IsTitleButtonVisible( TitleButton nButton ) const;
- void SetPin( bool bPin );
- bool IsPinned() const { return mbPinned; }
-
void RollUp();
void RollDown();
bool IsRollUp() const { return mbRollUp; }
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 7e176a5..0911d1c 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -96,7 +96,6 @@ private:
bool mbFloatWindow;
bool mbSmallOutBorder;
bool mbFrameBorder;
- bool mbPinned;
bool mbRollUp;
bool mbMenuHide;
bool mbDockBtn;
@@ -145,7 +144,6 @@ public:
void SetTitleType( BorderWindowTitleType nTitleType, const Size& rSize );
void SetBorderStyle( WindowBorderStyle nStyle );
WindowBorderStyle GetBorderStyle() const { return mnBorderStyle; }
- void SetPin( bool bPin );
void SetRollUp( bool bRollUp, const Size& rSize );
void SetCloseButton();
void SetDockButton( bool bDockButton );
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 5f16fe0..c017bbf 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1637,7 +1637,6 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent,
mnMaxHeight = SHRT_MAX;
mnRollHeight = 0;
mnOrgMenuHeight = 0;
- mbPinned = false;
mbRollUp = false;
mbMenuHide = false;
mbDockBtn = false;
@@ -1957,12 +1956,6 @@ void ImplBorderWindow::SetBorderStyle( WindowBorderStyle nStyle )
}
}
-void ImplBorderWindow::SetPin( bool bPin )
-{
- mbPinned = bPin;
- InvalidateBorder();
-}
-
void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize )
{
mbRollUp = bRollUp;
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index e467e25..12552d7 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -669,7 +669,6 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const vcl::Window *pWindow )
, mbDocking(false)
, mbLastFloatMode(false)
, mbStartFloat(false)
- , mbPinned(false)
, mbRollUp(false)
, mbDockBtn(false)
, mbHideBtn(false)
@@ -1110,7 +1109,6 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
// pass on DockingData to FloatingWindow
pWin->ShowTitleButton( TitleButton::Docking, mbDockBtn );
pWin->ShowTitleButton( TitleButton::Hide, mbHideBtn );
- pWin->SetPin( mbPinned );
if ( mbRollUp )
pWin->RollUp();
else
@@ -1134,7 +1132,6 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
maFloatPos = mpFloatWin->GetPosPixel();
mbDockBtn = mpFloatWin->IsTitleButtonVisible( TitleButton::Docking );
mbHideBtn = mpFloatWin->IsTitleButtonVisible( TitleButton::Hide );
- mbPinned = mpFloatWin->IsPinned();
mbRollUp = mpFloatWin->IsRollUp();
maRollUpOutSize = mpFloatWin->GetRollUpOutputSizePixel();
maMinOutSize = mpFloatWin->GetMinOutputSizePixel();
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index dd97368..a36b735 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -299,7 +299,6 @@ void DockingWindow::ImplInitDockingWindowData()
mbDragFull = false;
mbLastFloatMode = false;
mbStartFloat = false;
- mbPinned = false;
mbRollUp = false;
mbDockBtn = false;
mbHideBtn = false;
@@ -751,7 +750,6 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
// pass on DockingData to FloatingWindow
pWin->ShowTitleButton( TitleButton::Docking, mbDockBtn );
pWin->ShowTitleButton( TitleButton::Hide, mbHideBtn );
- pWin->SetPin( mbPinned );
if ( mbRollUp )
pWin->RollUp();
else
@@ -780,7 +778,6 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
maFloatPos = mpFloatWin->GetPosPixel();
mbDockBtn = mpFloatWin->IsTitleButtonVisible( TitleButton::Docking );
mbHideBtn = mpFloatWin->IsTitleButtonVisible( TitleButton::Hide );
- mbPinned = mpFloatWin->IsPinned();
mbRollUp = mpFloatWin->IsRollUp();
maRollUpOutSize = mpFloatWin->GetRollUpOutputSizePixel();
maMinOutSize = mpFloatWin->GetMinOutputSizePixel();
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 1d19490..c96939d 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -70,7 +70,6 @@ SystemWindow::ImplData::~ImplData()
SystemWindow::SystemWindow(WindowType nType)
: Window(nType)
- , mbPinned(false)
, mbRollUp(false)
, mbRollFunc(false)
, mbDockBtn(false)
@@ -372,16 +371,6 @@ bool SystemWindow::IsTitleButtonVisible( TitleButton nButton ) const
return mbHideBtn;
}
-void SystemWindow::SetPin( bool bPin )
-{
- if ( bPin != mbPinned )
- {
- mbPinned = bPin;
- if ( mpWindowImpl->mpBorderWindow )
- static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetPin( bPin );
- }
-}
-
void SystemWindow::RollUp()
{
if ( !mbRollUp )
commit cac974756f9a084216f9c555bbcd102465137d4b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 3 11:30:16 2017 +0000
SV_HELPTEXT_ALWAYSVISIBLE is unused
Change-Id: Ib602edbbc2d972ec77e4d9d76ac493912579554a
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index a2295b2..4c29393 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -76,7 +76,7 @@
#define SV_HELPTEXT_ROLLDOWN 10004
#define SV_HELPTEXT_ROLLUP 10005
#define SV_HELPTEXT_HELP 10006
-#define SV_HELPTEXT_ALWAYSVISIBLE 10007
+//free
#define SV_HELPTEXT_FADEIN 10008
#define SV_HELPTEXT_FADEOUT 10009
#define SV_HELPTEXT_SPLITFLOATING 10010
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index 7620c8f..78fc92c 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -57,11 +57,6 @@ String SV_HELPTEXT_HELP
Text [ en-US ] = "Help";
};
-String SV_HELPTEXT_ALWAYSVISIBLE
-{
- Text [ en-US ] = "Always visible";
-};
-
String SV_HELPTEXT_FADEIN
{
Text [ en-US ] = "Show";
commit b48e6dc3a5347a9a53d74f599b41b782cf7e9699
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 3 11:29:22 2017 +0000
mnPinState is unused
Change-Id: If8764b5cfda173bedfe2e911e39bf5b5e8a8573a
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 27c2dc9..7e176a5 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -200,7 +200,6 @@ struct ImplBorderFrameData
long mnBorderSize;
long mnTitleHeight;
BorderWindowHitTest mnHitTest;
- DrawButtonFlags mnPinState;
DrawButtonFlags mnCloseState;
DrawButtonFlags mnRollState;
DrawButtonFlags mnDockState;
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index d8a2de0..5f16fe0 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -746,7 +746,6 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo
maFrameData.mpBorderWindow = pBorderWindow;
maFrameData.mbDragFull = false;
maFrameData.mnHitTest = BorderWindowHitTest::NONE;
- maFrameData.mnPinState = DrawButtonFlags::NONE;
maFrameData.mnCloseState = DrawButtonFlags::NONE;
maFrameData.mnRollState = DrawButtonFlags::NONE;
maFrameData.mnDockState = DrawButtonFlags::NONE;
commit 95965d819e4e29de62d57f8e2b83159e7dcea13b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 3 11:28:38 2017 +0000
BorderWindowHitTest::Pin is never set
Change-Id: Ic50dd49b1470d4ee233e781e8c951c10c84968fd
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 25cc41a..27c2dc9 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -58,7 +58,6 @@ enum class BorderWindowHitTest {
Dock = 0x1000,
Hide = 0x2000,
Help = 0x4000,
- Pin = 0x8000
};
namespace o3tl {
template<> struct typed_flags<BorderWindowHitTest> : is_typed_flags<BorderWindowHitTest, 0xffff> {};
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index fd9fa17..d8a2de0 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -326,11 +326,6 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
nHelpId = SV_HELPTEXT_HELP;
rHelpRect = pData->maHelpRect;
}
- else if ( nHitTest & BorderWindowHitTest::Pin )
- {
- nHelpId = SV_HELPTEXT_ALWAYSVISIBLE;
- rHelpRect = Rectangle();
- }
else if ( nHitTest & BorderWindowHitTest::Title )
{
if( !pData->maTitleRect.IsEmpty() )
@@ -826,11 +821,6 @@ bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt )
maFrameData.mnHelpState |= DrawButtonFlags::Pressed;
pBorderWindow->InvalidateBorder();
}
- else if ( maFrameData.mnHitTest & BorderWindowHitTest::Pin )
- {
- maFrameData.mnPinState |= DrawButtonFlags::Pressed;
- pBorderWindow->InvalidateBorder();
- }
else
{
if ( rMEvt.GetClicks() == 1 )
@@ -1003,24 +993,6 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
}
}
}
- else if ( nHitTest & BorderWindowHitTest::Pin )
- {
- if ( maFrameData.mnPinState & DrawButtonFlags::Pressed )
- {
- maFrameData.mnPinState &= ~DrawButtonFlags::Pressed;
- pBorderWindow->InvalidateBorder();
-
- // do not call a Click-Handler when aborting
- if ( !rTEvt.IsTrackingCanceled() )
- {
- if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
- {
- SystemWindow* pClientWindow = static_cast<SystemWindow*>(pBorderWindow->ImplGetClientWindow());
- pClientWindow->SetPin( !pClientWindow->IsPinned() );
- }
- }
- }
- }
else
{
if ( maFrameData.mbDragFull )
@@ -1164,14 +1136,6 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
}
}
}
- else if ( maFrameData.mnHitTest & BorderWindowHitTest::Pin )
- {
- if ( maFrameData.mnPinState & DrawButtonFlags::Pressed )
- {
- maFrameData.mnPinState &= ~DrawButtonFlags::Pressed;
- pBorderWindow->InvalidateBorder();
- }
- }
else
{
aMousePos.X() -= maFrameData.maMouseOff.X();
commit cf8b7109c901fff155925aee014ba23c2917fb1c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 3 11:25:48 2017 +0000
no PinImgList is unused
Change-Id: Ifc1552fe9f82cc315f8ad821120339021be68dcf
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 18adb49..fb5d25d 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -211,7 +211,6 @@ struct ImplSVCtrlData
{
ImageList* mpCheckImgList = nullptr; // ImageList for CheckBoxes
ImageList* mpRadioImgList = nullptr; // ImageList for RadioButtons
- ImageList* mpPinImgList = nullptr; // ImageList for PIN
ImageList* mpSplitHPinImgList = nullptr; // ImageList for Horizontale SplitWindows
ImageList* mpSplitVPinImgList = nullptr; // ImageList for Vertikale SplitWindows (PIN's)
Image* mpDisclosurePlus = nullptr;
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 891fe57..a2295b2 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -31,8 +31,6 @@
#define SV_RESID_BITMAP_MSGBOX 1020
-#define SV_RESID_BITMAP_PIN 1030
-
#define SV_RESID_BITMAP_SPLITHPIN 1040
#define SV_RESID_BITMAP_SPLITVPIN 1041
#define SV_RESID_BITMAP_SPLITHARW 1042
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 2cd6137..26631ec 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -434,11 +434,6 @@ void DeInitVCL()
delete pSVData->maCtrlData.mpRadioImgList;
pSVData->maCtrlData.mpRadioImgList = nullptr;
}
- if ( pSVData->maCtrlData.mpPinImgList )
- {
- delete pSVData->maCtrlData.mpPinImgList;
- pSVData->maCtrlData.mpPinImgList = nullptr;
- }
if ( pSVData->maCtrlData.mpSplitHPinImgList )
{
delete pSVData->maCtrlData.mpSplitHPinImgList;
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 77cfb39..c29f357 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -54,11 +54,6 @@ Bitmap SV_RESID_BITMAP_MSGBOX
File = "msgbox.png";
};
-Bitmap SV_RESID_BITMAP_PIN
-{
- File = "pin.png";
-};
-
Bitmap SV_RESID_BITMAP_CLOSEDOC
{
File = "closedoc.png";
commit 6fda9fae0cd80f7ba6a8c2fad1de6bc889737bd4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 3 11:23:43 2017 +0000
so maPinRect is always empty
Change-Id: Ia2ee10ead7068d4809f5a3ba8fbf01fdf6e4a1c9
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 3e02d04..25cc41a 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -180,7 +180,6 @@ struct ImplBorderFrameData
VclPtr<ImplBorderWindow> mpBorderWindow;
VclPtr<OutputDevice> mpOutDev;
Rectangle maTitleRect;
- Rectangle maPinRect;
Rectangle maCloseRect;
Rectangle maRollRect;
Rectangle maDockRect;
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 94c64f5..fd9fa17 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -42,42 +42,6 @@ using namespace ::com::sun::star::uno;
// useful caption height for title bar buttons
#define MIN_CAPTION_HEIGHT 18
-static void ImplGetPinImage( DrawButtonFlags nStyle, bool bPinIn, Image& rImage )
-{
- // load ImageList if not available yet
- ImplSVData* pSVData = ImplGetSVData();
- if ( !pSVData->maCtrlData.mpPinImgList )
- {
- ResMgr* pResMgr = ImplGetResMgr();
- pSVData->maCtrlData.mpPinImgList = new ImageList();
- if( pResMgr )
- {
- Color aMaskColor( 0x00, 0x00, 0xFF );
- pSVData->maCtrlData.mpPinImgList->InsertFromHorizontalBitmap
- ( ResId( SV_RESID_BITMAP_PIN, *pResMgr ), 4,
- &aMaskColor );
- }
- }
-
- // get and return Image
- sal_uInt16 nId;
- if ( nStyle & DrawButtonFlags::Pressed )
- {
- if ( bPinIn )
- nId = 4;
- else
- nId = 3;
- }
- else
- {
- if ( bPinIn )
- nId = 2;
- else
- nId = 1;
- }
- rImage = pSVData->maCtrlData.mpPinImgList->GetImage( nId );
-}
-
namespace vcl {
void Window::ImplCalcSymbolRect( Rectangle& rRect )
@@ -228,8 +192,6 @@ BorderWindowHitTest ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pDat
return BorderWindowHitTest::Hide;
else if ( pData->maHelpRect.IsInside( rPos ) )
return BorderWindowHitTest::Help;
- else if ( pData->maPinRect.IsInside( rPos ) )
- return BorderWindowHitTest::Pin;
else
return BorderWindowHitTest::Title;
}
@@ -367,7 +329,7 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
else if ( nHitTest & BorderWindowHitTest::Pin )
{
nHelpId = SV_HELPTEXT_ALWAYSVISIBLE;
- rHelpRect = pData->maPinRect;
+ rHelpRect = Rectangle();
}
else if ( nHitTest & BorderWindowHitTest::Title )
{
@@ -398,7 +360,6 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData
ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
long nTitleWidth = pBorderWindow->GetTextWidth( pBorderWindow->GetText() )+6;
- nTitleWidth += pData->maPinRect.GetWidth();
nTitleWidth += pData->maCloseRect.GetWidth();
nTitleWidth += pData->maRollRect.GetWidth();
nTitleWidth += pData->maDockRect.GetWidth();
@@ -1205,21 +1166,10 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
}
else if ( maFrameData.mnHitTest & BorderWindowHitTest::Pin )
{
- if ( maFrameData.maPinRect.IsInside( aMousePos ) )
- {
- if ( !(maFrameData.mnPinState & DrawButtonFlags::Pressed) )
- {
- maFrameData.mnPinState |= DrawButtonFlags::Pressed;
- pBorderWindow->InvalidateBorder();
- }
- }
- else
+ if ( maFrameData.mnPinState & DrawButtonFlags::Pressed )
{
- if ( maFrameData.mnPinState & DrawButtonFlags::Pressed )
- {
- maFrameData.mnPinState &= ~DrawButtonFlags::Pressed;
- pBorderWindow->InvalidateBorder();
- }
+ maFrameData.mnPinState &= ~DrawButtonFlags::Pressed;
+ pBorderWindow->InvalidateBorder();
}
}
else
@@ -1465,7 +1415,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
}
else
{
- pData->maPinRect.SetEmpty();
pData->maCloseRect.SetEmpty();
pData->maDockRect.SetEmpty();
pData->maMenuRect.SetEmpty();
@@ -1479,7 +1428,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
else
{
pData->maTitleRect.SetEmpty();
- pData->maPinRect.SetEmpty();
pData->maCloseRect.SetEmpty();
pData->maDockRect.SetEmpty();
pData->maMenuRect.SetEmpty();
@@ -1587,9 +1535,6 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, con
aInRect.Left() += 2;
aInRect.Right() -= 2;
- if (!pData->maPinRect.IsEmpty())
- aInRect.Left() = pData->maPinRect.Right() + 2;
-
if (!pData->maHelpRect.IsEmpty())
aInRect.Right() = pData->maHelpRect.Left() - 2;
else if (!pData->maRollRect.IsEmpty())
@@ -1665,25 +1610,6 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, con
aSymbolRect.Move(pOffset->X(), pOffset->Y());
ImplDrawBrdWinSymbolButton(&rRenderContext, aSymbolRect, SymbolType::HELP, pData->mnHelpState);
}
- if (!pData->maPinRect.IsEmpty())
- {
- Image aImage;
- ImplGetPinImage(pData->mnPinState, pBorderWindow->mbPinned, aImage);
- Size aImageSize = aImage.GetSizePixel();
- long nRectHeight = pData->maPinRect.GetHeight();
- Point aPos(pData->maPinRect.TopLeft());
- if (pOffset)
- aPos.Move(pOffset->X(), pOffset->Y());
- if (nRectHeight < aImageSize.Height())
- {
- rRenderContext.DrawImage(aPos, Size( aImageSize.Width(), nRectHeight ), aImage);
- }
- else
- {
- aPos.Y() += (nRectHeight-aImageSize.Height()) / 2;
- rRenderContext.DrawImage(aPos, aImage);
- }
- }
}
void ImplBorderWindow::ImplInit( vcl::Window* pParent,
commit 19ce5fa563f30a9147c0d3d903a5c556062a73be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 3 11:18:39 2017 +0000
WB_PINABLE isn't set anywhere
Change-Id: I6acc4b9dc87dd6023b5ad7013bc27180d6e0db6c
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 0d8e9b7..7324ee0 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -130,7 +130,6 @@ WinBits const WB_ROLLABLE = 0x00000200;
WinBits const WB_CLOSEABLE = 0x00000400;
WinBits const WB_STANDALONE = 0x00000800;
WinBits const WB_APP = 0x00001000;
-WinBits const WB_PINABLE = 0x00002000;
WinBits const WB_SYSTEMWINDOW = SAL_CONST_INT64(0x40000000);
// warning: do not confuse WB_SYSTEMCHILDWINDOW with the SystemChildWindow class
//
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index f66664a..94c64f5 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 0393836..e467e25 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 67c67c0..dd97368 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
{
More information about the Libreoffice-commits
mailing list