[Libreoffice-commits] core.git: 3 commits - include/vcl reportdesign/source sfx2/source vcl/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Jan 4 16:51:16 UTC 2017
include/vcl/splitwin.hxx | 9 -
reportdesign/source/ui/report/DesignView.cxx | 1
sfx2/source/dialog/splitwin.cxx | 11 -
vcl/inc/svdata.hxx | 2
vcl/inc/svids.hrc | 5
vcl/source/app/svmain.cxx | 10 -
vcl/source/src/images.src | 20 --
vcl/source/window/splitwin.cxx | 218 +++------------------------
8 files changed, 26 insertions(+), 250 deletions(-)
New commits:
commit ebcad1fa79bf5e55bafebae38e59efd8bb445c13
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 16:07:15 2017 +0000
unused bitmap resources
Change-Id: Ia76b548e993d13c7706ab126109086cbd0717b4c
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 732e15f..18f1238 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -34,9 +34,6 @@
#define SV_RESID_BITMAP_WARNINGBOX 1022
#define SV_RESID_BITMAP_INFOBOX 1023
-#define SV_RESID_BITMAP_SPLITHARW 1042
-#define SV_RESID_BITMAP_SPLITVARW 1043
-
#define SV_RESID_BITMAP_SCROLLMSK 1050
#define SV_RESID_BITMAP_WHEELVH 1051
#define SV_RESID_BITMAP_WHEELV 1052
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index f04bb02..c6eaeef 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_SPLITHARW
-{
- File = "splharw.png";
-};
-
-Bitmap SV_RESID_BITMAP_SPLITVARW
-{
- File = "splvarw.png";
-};
-
Bitmap (SV_ICON_SIZE48_START)
{
File = "mainapp_48_8.png" ;
commit 9e7b0ef950035393e28d2c1469c4c1a0a5662c17
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 15:45:15 2017 +0000
follow up remove unused autohide leftovers
Change-Id: Ic7281e915075519c300a330557399111838d7d34
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 80e03b6..045eb27 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 67c0190..79f05ab 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 a8b3ccb..3629387 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 af3dce7..732e15f 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 cf9704f..e7b8647 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 bc96efb..f04bb02 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 768af62..0f3df6a 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;
commit b4a31534b949c512facdc7b0d148f249db285d13
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 15:32:08 2017 +0000
drop AutoHide code
only used from reportdesign and that appears to be overlooked from an earlier
eradication program
Change-Id: I196fd7ccbc909c935daf534d55e6b39de8510f23
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 1f12174..80e03b6 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -73,7 +73,6 @@ private:
mbCalc:1,
mbRecalc:1,
mbInvalidate:1,
- mbAutoHide:1,
mbFadeIn:1,
mbFadeOut:1,
mbAutoHideIn:1,
@@ -94,11 +93,9 @@ private:
SAL_DLLPRIVATE void ImplSetWindowSize( long nDelta );
SAL_DLLPRIVATE void ImplSplitMousePos( Point& rMousePos );
SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) const;
- SAL_DLLPRIVATE void ImplGetAutoHideRect( Rectangle& rRect, bool bTest = false ) const;
SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, bool bTest = false ) const;
SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, bool bTest = false ) const;
SAL_DLLPRIVATE void ImplDrawButtonRect(vcl::RenderContext& rRenderContext, const Rectangle& rRect, long nSize);
- SAL_DLLPRIVATE void ImplDrawAutoHide(vcl::RenderContext& rRenderContext);
SAL_DLLPRIVATE void ImplDrawFadeIn(vcl::RenderContext& rRenderContext);
SAL_DLLPRIVATE void ImplDrawFadeOut(vcl::RenderContext& rRenderContext);
SAL_DLLPRIVATE void ImplNewAlign();
@@ -185,8 +182,6 @@ public:
Size CalcLayoutSizePixel( const Size& aNewSize );
- void ShowAutoHideButton( bool bShow = true );
- bool IsAutoHideButtonVisible() const { return mbAutoHide; }
void ShowFadeInHideButton();
void ShowFadeOutButton();
long GetFadeInSize() const;
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 4c20392..5332dbc 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -113,7 +113,6 @@ ODesignView::ODesignView( vcl::Window* pParent,
// Splitter einrichten
m_aSplitWin->SetSplitHdl(LINK(this, ODesignView,SplitHdl));
- m_aSplitWin->ShowAutoHideButton();
m_aSplitWin->SetAlign(WindowAlign::Left);
m_aSplitWin->Show();
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 7e96d95..67c0190 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -110,7 +110,6 @@ public:
aTimer.SetTimeout( 200 );
SetAlign( pOwner->GetAlign() );
Actualize();
- ShowAutoHideButton( pOwner->IsAutoHideButtonVisible() );
ShowFadeInHideButton();
}
@@ -198,9 +197,8 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl,
pEmptyWin(nullptr),
pActive(nullptr)
{
- if ( bWithButtons )
+ if (bWithButtons)
{
- ShowAutoHideButton( false ); // no autohide button (pin) anymore
ShowFadeOutButton();
}
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index a50aaf3..768af62 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -283,7 +283,7 @@ void SplitWindow::ImplDrawBorder(vcl::RenderContext& rRenderContext)
void SplitWindow::ImplDrawBorderLine(vcl::RenderContext& rRenderContext)
{
- if (mbFadeOut || mbAutoHide)
+ if (mbFadeOut)
{
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
long nDX = mnDX;
@@ -1231,7 +1231,7 @@ sal_uInt16 SplitWindow::ImplTestSplit( SplitWindow* pWindow, const Point& rPos,
nTPos = rPos.X();
}
long nSplitSize = pWindow->mpMainSet->mnSplitSize-2;
- if ( pWindow->mbAutoHide || pWindow->mbFadeOut )
+ if (pWindow->mbFadeOut)
nSplitSize += SPLITWIN_SPLITSIZEEXLN;
if ( !pWindow->mbBottomRight )
nPos -= nSplitSize;
@@ -1266,7 +1266,7 @@ void SplitWindow::ImplDrawSplitTracking(const Point& rPos)
aRect.Right() = aRect.Left() + mpSplitSet->mnSplitSize - 1;
if (!(mnWinStyle & WB_NOSPLITDRAW))
aRect.Right()--;
- if ((mnSplitTest & SPLIT_WINDOW) && (mbAutoHide || mbFadeOut))
+ if ((mnSplitTest & SPLIT_WINDOW) && (mbFadeOut))
{
aRect.Left() += SPLITWIN_SPLITSIZEEXLN;
aRect.Right() += SPLITWIN_SPLITSIZEEXLN;
@@ -1280,7 +1280,7 @@ void SplitWindow::ImplDrawSplitTracking(const Point& rPos)
aRect.Bottom() = aRect.Top() + mpSplitSet->mnSplitSize - 1;
if (!(mnWinStyle & WB_NOSPLITDRAW))
aRect.Bottom()--;
- if ((mnSplitTest & SPLIT_WINDOW) && (mbAutoHide || mbFadeOut))
+ if ((mnSplitTest & SPLIT_WINDOW) && (mbFadeOut))
{
aRect.Top() += SPLITWIN_SPLITSIZEEXLN;
aRect.Bottom() += SPLITWIN_SPLITSIZEEXLN;
@@ -1318,7 +1318,6 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
mbCalc = false;
mbRecalc = true;
mbInvalidate = true;
- mbAutoHide = false;
mbFadeIn = false;
mbFadeOut = false;
mbAutoHideIn = false;
@@ -1444,7 +1443,7 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
Size aSize( aNewSize );
long nSplitSize = mpMainSet->mnSplitSize-2;
- if ( mbAutoHide || mbFadeOut )
+ if (mbFadeOut)
nSplitSize += SPLITWIN_SPLITSIZEEXLN;
// if the window is sizeable and if it does not contain a relative window,
@@ -1509,7 +1508,7 @@ void SplitWindow::ImplCalcLayout()
return;
long nSplitSize = mpMainSet->mnSplitSize-2;
- if ( mbAutoHide || mbFadeOut )
+ if (mbFadeOut)
nSplitSize += SPLITWIN_SPLITSIZEEXLN;
// if the window is sizeable and if it does not contain a relative window,
@@ -1623,7 +1622,7 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos )
void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) const
{
long nSplitSize = mpMainSet->mnSplitSize-1;
- if ( mbAutoHide || mbFadeOut || mbFadeIn )
+ if (mbFadeOut || mbFadeIn)
nSplitSize += SPLITWIN_SPLITSIZEEX;
long nButtonSize = 0;
@@ -1631,8 +1630,6 @@ void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) co
nButtonSize += SPLITWIN_SPLITSIZEFADE+1;
if ( mbFadeOut )
nButtonSize += SPLITWIN_SPLITSIZEFADE+1;
- if ( mbAutoHide )
- nButtonSize += SPLITWIN_SPLITSIZEAUTOHIDE+1;
long nCenterEx = 0;
if ( mbHorz )
nCenterEx += ((mnDX-mnLeftBorder-mnRightBorder)-nButtonSize)/2;
@@ -1690,21 +1687,6 @@ void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) co
}
}
-void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, bool bTest ) const
-{
- Rectangle aRect;
-
- if ( mbAutoHide )
- {
- long nEx = 0;
- if ( mbFadeIn || mbFadeOut )
- nEx = SPLITWIN_SPLITSIZEFADE+1;
- ImplGetButtonRect( aRect, nEx, bTest && mbFadeIn );
- }
-
- rRect = aRect;
-}
-
void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, bool bTest ) const
{
Rectangle aRect;
@@ -1791,81 +1773,6 @@ void SplitWindow::ImplDrawButtonRect(vcl::RenderContext& rRenderContext, const R
}
}
-void SplitWindow::ImplDrawAutoHide(vcl::RenderContext& rRenderContext)
-{
- if (mbAutoHide)
- {
- Rectangle aTempRect;
- ImplGetAutoHideRect( aTempRect );
-
- // load ImageListe, if not available
- ImplSVData* pSVData = ImplGetSVData();
- ImageList* pImageList;
- if (mbHorz)
- {
- if (!pSVData->maCtrlData.mpSplitHPinImgList)
- {
- ResMgr* pResMgr = ImplGetResMgr();
- if (pResMgr)
- {
- Color aNonAlphaMask( 0x00, 0x00, 0xFF );
- pSVData->maCtrlData.mpSplitHPinImgList = new ImageList;
- pSVData->maCtrlData.mpSplitHPinImgList->InsertFromHorizontalBitmap
- ( ResId( SV_RESID_BITMAP_SPLITHPIN, *pResMgr ), 4, &aNonAlphaMask );
- }
- }
- pImageList = pSVData->maCtrlData.mpSplitHPinImgList;
- }
- else
- {
- if (!pSVData->maCtrlData.mpSplitVPinImgList)
- {
- ResMgr* pResMgr = ImplGetResMgr();
- pSVData->maCtrlData.mpSplitVPinImgList = new ImageList;
- if (pResMgr)
- {
- Color aNonAlphaMask( 0x00, 0x00, 0xFF );
- pSVData->maCtrlData.mpSplitVPinImgList->InsertFromHorizontalBitmap(
- ResId( SV_RESID_BITMAP_SPLITVPIN, *pResMgr ), 4, &aNonAlphaMask);
- }
- }
- pImageList = pSVData->maCtrlData.mpSplitVPinImgList;
- }
-
- if (!pImageList)
- return;
-
- // retrieve and return image
- sal_uInt16 nId;
- if (mbAutoHidePressed)
- {
- if (mbAutoHideIn)
- nId = 3;
- else
- nId = 4;
- }
- else
- {
- if (mbAutoHideIn)
- nId = 1;
- else
- nId = 2;
- }
-
- Image aImage = pImageList->GetImage( nId );
- Size aImageSize = aImage.GetSizePixel();
- Point aPos(aTempRect.Left() + ((aTempRect.GetWidth() - aImageSize.Width()) / 2),
- aTempRect.Top() + ((aTempRect.GetHeight() - aImageSize.Height()) / 2));
- long nSize;
- if (mbHorz)
- nSize = aImageSize.Width();
- else
- nSize = aImageSize.Height();
- ImplDrawButtonRect(rRenderContext, aTempRect, nSize);
- rRenderContext.DrawImage(aPos, aImage);
- }
-}
-
void SplitWindow::ImplDrawGrip(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bHorizontal, bool bLeft)
{
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
@@ -2224,37 +2131,28 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
Rectangle aTestRect;
mbFadeNoButtonMode = false;
- ImplGetAutoHideRect( aTestRect, true );
+
+ ImplGetFadeOutRect( aTestRect, true );
if ( aTestRect.IsInside( aMousePosPixel ) )
{
- mbAutoHideDown = true;
- mbAutoHidePressed = true;
+ mbFadeOutDown = true;
+ mbFadeOutPressed = true;
Invalidate();
}
else
{
- ImplGetFadeOutRect( aTestRect, true );
+ ImplGetFadeInRect( aTestRect, true );
if ( aTestRect.IsInside( aMousePosPixel ) )
{
- mbFadeOutDown = true;
- mbFadeOutPressed = true;
+ mbFadeInDown = true;
+ mbFadeInPressed = true;
Invalidate();
}
- else
+ else if ( !aTestRect.IsEmpty() && !(mnWinStyle & WB_SIZEABLE) )
{
- ImplGetFadeInRect( aTestRect, true );
- if ( aTestRect.IsInside( aMousePosPixel ) )
- {
- mbFadeInDown = true;
- mbFadeInPressed = true;
- Invalidate();
- }
- else if ( !aTestRect.IsEmpty() && !(mnWinStyle & WB_SIZEABLE) )
- {
- mbFadeNoButtonMode = true;
- FadeIn();
- return;
- }
+ mbFadeNoButtonMode = true;
+ FadeIn();
+ return;
}
}
@@ -2274,15 +2172,12 @@ void SplitWindow::MouseMove( const MouseEvent& rMEvt )
sal_uInt16 nTempSplitPos;
sal_uInt16 nSplitTest = ImplTestSplit( this, aPos, nTemp, &pTempSplitSet, nTempSplitPos );
PointerStyle eStyle = PointerStyle::Arrow;
- Rectangle aAutoHideRect;
Rectangle aFadeInRect;
Rectangle aFadeOutRect;
- ImplGetAutoHideRect( aAutoHideRect );
ImplGetFadeInRect( aFadeInRect );
ImplGetFadeOutRect( aFadeOutRect );
- if ( !aAutoHideRect.IsInside( aPos ) &&
- !aFadeInRect.IsInside( aPos ) &&
+ if ( !aFadeInRect.IsInside( aPos ) &&
!aFadeOutRect.IsInside( aPos ) )
{
if ( nSplitTest && !(nSplitTest & SPLIT_NOSPLIT) )
@@ -2324,9 +2219,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
}
else
{
- Rectangle aTestRect;
- ImplGetAutoHideRect( aTestRect, true );
- bool bNewPressed = aTestRect.IsInside( aMousePosPixel );
+ bool bNewPressed = false;
if ( bNewPressed != mbAutoHidePressed )
{
mbAutoHidePressed = bNewPressed;
@@ -2517,7 +2410,6 @@ void SplitWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
ImplDrawBorderLine(rRenderContext);
ImplDrawFadeOut(rRenderContext);
ImplDrawFadeIn(rRenderContext);
- ImplDrawAutoHide(rRenderContext);
// draw FrameSet-backgrounds
ImplDrawBack(rRenderContext, mpMainSet);
@@ -2549,25 +2441,14 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt )
Rectangle aHelpRect;
sal_uInt16 nHelpResId = 0;
- ImplGetAutoHideRect( aHelpRect, true );
+ ImplGetFadeInRect( aHelpRect, true );
if ( aHelpRect.IsInside( aMousePosPixel ) )
- {
- if ( mbAutoHideIn )
- nHelpResId = SV_HELPTEXT_SPLITFIXED;
- else
- nHelpResId = SV_HELPTEXT_SPLITFLOATING;
- }
+ nHelpResId = SV_HELPTEXT_FADEIN;
else
{
- ImplGetFadeInRect( aHelpRect, true );
+ ImplGetFadeOutRect( aHelpRect, true );
if ( aHelpRect.IsInside( aMousePosPixel ) )
- nHelpResId = SV_HELPTEXT_FADEIN;
- else
- {
- ImplGetFadeOutRect( aHelpRect, true );
- if ( aHelpRect.IsInside( aMousePosPixel ) )
- nHelpResId = SV_HELPTEXT_FADEOUT;
- }
+ nHelpResId = SV_HELPTEXT_FADEOUT;
}
// get rectangle
@@ -3192,12 +3073,6 @@ void SplitWindow::SetAlign( WindowAlign eNewAlign )
}
}
-void SplitWindow::ShowAutoHideButton( bool bShow )
-{
- mbAutoHide = bShow;
- ImplUpdate();
-}
-
void SplitWindow::ShowFadeInHideButton()
{
mbFadeIn = true;
@@ -3215,9 +3090,7 @@ void SplitWindow::SetAutoHideState( bool bAutoHide )
mbAutoHideIn = bAutoHide;
if ( IsReallyVisible() )
{
- Rectangle aRect;
- ImplGetAutoHideRect( aRect );
- Invalidate( aRect );
+ Invalidate(Rectangle());
}
}
More information about the Libreoffice-commits
mailing list