diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-04 15:45:15 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-04 16:50:44 +0000 |
commit | 9e7b0ef950035393e28d2c1469c4c1a0a5662c17 (patch) | |
tree | 17129a53d82cf43a10b8aeaf7b53a962284c031c | |
parent | b4a31534b949c512facdc7b0d148f249db285d13 (diff) |
follow up remove unused autohide leftovers
Change-Id: Ic7281e915075519c300a330557399111838d7d34
-rw-r--r-- | include/vcl/splitwin.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 7 | ||||
-rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/svids.hrc | 2 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 10 | ||||
-rw-r--r-- | vcl/source/src/images.src | 10 | ||||
-rw-r--r-- | vcl/source/window/splitwin.cxx | 45 |
7 files changed, 2 insertions, 78 deletions
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 80e03b686e21..045eb277e918 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -75,11 +75,8 @@ private: mbInvalidate:1, mbFadeIn:1, mbFadeOut:1, - mbAutoHideIn:1, - mbAutoHideDown:1, mbFadeInDown:1, mbFadeOutDown:1, - mbAutoHidePressed:1, mbFadeInPressed:1, mbFadeOutPressed:1, mbFadeNoButtonMode:1; @@ -187,7 +184,6 @@ public: long GetFadeInSize() const; bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } - void SetAutoHideState( bool bAutoHide ); void SetSplitHdl( const Link<SplitWindow*,void>& rLink ) { maSplitHdl = rLink; } }; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 67c019002d0a..79f05ab6d9a6 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -283,9 +283,6 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, pEmptyWin->bFadeIn = true; pEmptyWin->nState = 2; } - - SetAutoHideState( !bPinned ); - pEmptyWin->SetAutoHideState( !bPinned ); } @@ -1092,12 +1089,8 @@ void SfxSplitWindow::SetPinned_Impl( bool bOn ) pWorkWin->RegisterChild_Impl( *this, eAlign, true )->nVisible = SfxChildVisibility::VISIBLE; } } - - SetAutoHideState( !bPinned ); - pEmptyWin->SetAutoHideState( !bPinned ); } - void SfxSplitWindow::SetFadeIn_Impl( bool bOn ) { if ( bOn == pEmptyWin->bFadeIn ) diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index a8b3ccbf690a..362938766dd3 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -212,8 +212,6 @@ struct ImplSVCtrlData { ImageList* mpCheckImgList = nullptr; // ImageList for CheckBoxes ImageList* mpRadioImgList = nullptr; // ImageList for RadioButtons - ImageList* mpSplitHPinImgList = nullptr; // ImageList for Horizontale SplitWindows - ImageList* mpSplitVPinImgList = nullptr; // ImageList for Vertikale SplitWindows (PIN's) Image* mpDisclosurePlus = nullptr; Image* mpDisclosureMinus = nullptr; ImplTBDragMgr* mpTBDragMgr = nullptr; // DragMgr for ToolBox diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index af3dce70fd29..732e15fd4ce0 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -34,8 +34,6 @@ #define SV_RESID_BITMAP_WARNINGBOX 1022 #define SV_RESID_BITMAP_INFOBOX 1023 -#define SV_RESID_BITMAP_SPLITHPIN 1040 -#define SV_RESID_BITMAP_SPLITVPIN 1041 #define SV_RESID_BITMAP_SPLITHARW 1042 #define SV_RESID_BITMAP_SPLITVARW 1043 diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index cf9704f3796b..e7b86478f54b 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -430,16 +430,6 @@ void DeInitVCL() delete pSVData->maCtrlData.mpRadioImgList; pSVData->maCtrlData.mpRadioImgList = nullptr; } - if ( pSVData->maCtrlData.mpSplitHPinImgList ) - { - delete pSVData->maCtrlData.mpSplitHPinImgList; - pSVData->maCtrlData.mpSplitHPinImgList = nullptr; - } - if ( pSVData->maCtrlData.mpSplitVPinImgList ) - { - delete pSVData->maCtrlData.mpSplitVPinImgList; - pSVData->maCtrlData.mpSplitVPinImgList = nullptr; - } if ( pSVData->maCtrlData.mpDisclosurePlus ) { delete pSVData->maCtrlData.mpDisclosurePlus; diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index bc96efbd8343..f04bb028c6ef 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -109,16 +109,6 @@ Bitmap SV_RESID_BITMAP_REFRESH File = "reload.png"; }; -Bitmap SV_RESID_BITMAP_SPLITHPIN -{ - File = "splhpin.png"; -}; - -Bitmap SV_RESID_BITMAP_SPLITVPIN -{ - File = "splvpin.png"; -}; - Bitmap SV_RESID_BITMAP_SPLITHARW { File = "splharw.png"; diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 768af62ad025..0f3df6a3adcc 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -1320,11 +1320,8 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) mbInvalidate = true; mbFadeIn = false; mbFadeOut = false; - mbAutoHideIn = false; - mbAutoHideDown = false; mbFadeInDown = false; mbFadeOutDown = false; - mbAutoHidePressed = false; mbFadeInPressed = false; mbFadeOutPressed = false; mbFadeNoButtonMode = false; @@ -2156,7 +2153,7 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } - if ( mbAutoHideDown || mbFadeInDown || mbFadeOutDown ) + if ( mbFadeInDown || mbFadeOutDown ) StartTracking(); else ImplStartSplit( rMEvt ); @@ -2198,36 +2195,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { Point aMousePosPixel = rTEvt.GetMouseEvent().GetPosPixel(); - if ( mbAutoHideDown ) - { - if ( rTEvt.IsTrackingEnded() ) - { - mbAutoHideDown = false; - if ( mbAutoHidePressed ) - { - mbAutoHidePressed = false; - - if ( !rTEvt.IsTrackingCanceled() ) - { - mbAutoHideIn = !mbAutoHideIn; - Invalidate(); - AutoHide(); - } - else - Invalidate(); - } - } - else - { - bool bNewPressed = false; - if ( bNewPressed != mbAutoHidePressed ) - { - mbAutoHidePressed = bNewPressed; - Invalidate(); - } - } - } - else if ( mbFadeInDown ) + if ( mbFadeInDown ) { if ( rTEvt.IsTrackingEnded() ) { @@ -3085,15 +3053,6 @@ void SplitWindow::ShowFadeOutButton() ImplUpdate(); } -void SplitWindow::SetAutoHideState( bool bAutoHide ) -{ - mbAutoHideIn = bAutoHide; - if ( IsReallyVisible() ) - { - Invalidate(Rectangle()); - } -} - long SplitWindow::GetFadeInSize() const { long n = 0; |