This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new cee87ae298 Cleanup
cee87ae298 is described below
commit cee87ae2982986b15f813be56517ed1a920b59cd
Author: mseidel <[email protected]>
AuthorDate: Sat Jan 17 13:43:58 2026 +0100
Cleanup
(cherry picked from commit 7540865d44c9eb37aba9b6e1796cf4bc266ae9a2)
---
main/vcl/source/window/scrwnd.cxx | 554 +++++++++++++++++++-------------------
main/vcl/source/window/scrwnd.hxx | 8 +-
2 files changed, 281 insertions(+), 281 deletions(-)
diff --git a/main/vcl/source/window/scrwnd.cxx
b/main/vcl/source/window/scrwnd.cxx
index 1078f21054..eeb0c43811 100644
--- a/main/vcl/source/window/scrwnd.cxx
+++ b/main/vcl/source/window/scrwnd.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -43,60 +41,60 @@
// - Defines -
// -----------
-#define WHEEL_WIDTH 25
-#define WHEEL_RADIUS ((WHEEL_WIDTH) >> 1 )
-#define MAX_TIME 300
-#define MIN_TIME 20
-#define DEF_TIMEOUT 50
+#define WHEEL_WIDTH 25
+#define WHEEL_RADIUS ((WHEEL_WIDTH) >> 1 )
+#define MAX_TIME 300
+#define MIN_TIME 20
+#define DEF_TIMEOUT 50
// -------------------
// - ImplWheelWindow -
// -------------------
ImplWheelWindow::ImplWheelWindow( Window* pParent ) :
- FloatingWindow ( pParent, 0 ),
- mnRepaintTime ( 1UL ),
- mnTimeout ( DEF_TIMEOUT ),
- mnWheelMode ( WHEELMODE_NONE ),
- mnActDist ( 0UL ),
- mnActDeltaX ( 0L ),
- mnActDeltaY ( 0L )
+ FloatingWindow ( pParent, 0 ),
+ mnRepaintTime ( 1UL ),
+ mnTimeout ( DEF_TIMEOUT ),
+ mnWheelMode ( WHEELMODE_NONE ),
+ mnActDist ( 0UL ),
+ mnActDeltaX ( 0L ),
+ mnActDeltaY ( 0L )
{
- // we need a parent
- DBG_ASSERT( pParent, "ImplWheelWindow::ImplWheelWindow(): Parent not set!"
);
-
- const Size aSize( pParent->GetOutputSizePixel() );
- const sal_uInt16 nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
- const sal_Bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
- const sal_Bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
-
- // calculate maximum speed distance
- mnMaxWidth = (sal_uLong) ( 0.4 * hypot( (double) aSize.Width(),
aSize.Height() ) );
-
- // create wheel window
- SetTitleType( FLOATWIN_TITLE_NONE );
- ImplCreateImageList();
- ResMgr* pResMgr = ImplGetResMgr();
- Bitmap aBmp;
- if( pResMgr )
- aBmp = Bitmap( ResId( SV_RESID_BITMAP_SCROLLMSK, *pResMgr ) );
- ImplSetRegion( aBmp );
-
- // set wheel mode
- if( bHorz && bVert )
- ImplSetWheelMode( WHEELMODE_VH );
- else if( bHorz )
- ImplSetWheelMode( WHEELMODE_H );
- else
- ImplSetWheelMode( WHEELMODE_V );
-
- // init timer
- mpTimer = new Timer;
- mpTimer->SetTimeoutHdl( LINK( this, ImplWheelWindow, ImplScrollHdl ) );
- mpTimer->SetTimeout( mnTimeout );
- mpTimer->Start();
-
- CaptureMouse();
+ // we need a parent
+ DBG_ASSERT( pParent, "ImplWheelWindow::ImplWheelWindow(): Parent not
set!" );
+
+ const Size aSize( pParent->GetOutputSizePixel() );
+ const sal_uInt16 nFlags =
ImplGetSVData()->maWinData.mnAutoScrollFlags;
+ const sal_Bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
+ const sal_Bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+
+ // calculate maximum speed distance
+ mnMaxWidth = (sal_uLong) ( 0.4 * hypot( (double) aSize.Width(),
aSize.Height() ) );
+
+ // create wheel window
+ SetTitleType( FLOATWIN_TITLE_NONE );
+ ImplCreateImageList();
+ ResMgr* pResMgr = ImplGetResMgr();
+ Bitmap aBmp;
+ if( pResMgr )
+ aBmp = Bitmap( ResId( SV_RESID_BITMAP_SCROLLMSK, *pResMgr ) );
+ ImplSetRegion( aBmp );
+
+ // set wheel mode
+ if( bHorz && bVert )
+ ImplSetWheelMode( WHEELMODE_VH );
+ else if( bHorz )
+ ImplSetWheelMode( WHEELMODE_H );
+ else
+ ImplSetWheelMode( WHEELMODE_V );
+
+ // init timer
+ mpTimer = new Timer;
+ mpTimer->SetTimeoutHdl( LINK( this, ImplWheelWindow, ImplScrollHdl ) );
+ mpTimer->SetTimeout( mnTimeout );
+ mpTimer->Start();
+
+ CaptureMouse();
}
// ------------------------------------------------------------------------
@@ -104,15 +102,15 @@ ImplWheelWindow::ImplWheelWindow( Window* pParent ) :
ImplWheelWindow::~ImplWheelWindow()
{
ImplStop();
- delete mpTimer;
+ delete mpTimer;
}
// ------------------------------------------------------------------------
void ImplWheelWindow::ImplStop()
{
- ReleaseMouse();
- mpTimer->Stop();
+ ReleaseMouse();
+ mpTimer->Stop();
Show(sal_False);
}
@@ -120,290 +118,292 @@ void ImplWheelWindow::ImplStop()
void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp )
{
- Point aPos( GetPointerPosPixel() );
- const Size aSize( rRegionBmp.GetSizePixel() );
- Point aPoint;
- const Rectangle aRect( aPoint, aSize );
+ Point aPos( GetPointerPosPixel() );
+ const Size aSize( rRegionBmp.GetSizePixel() );
+ Point aPoint;
+ const Rectangle aRect( aPoint, aSize );
- maCenter = maLastMousePos = aPos;
- aPos.X() -= aSize.Width() >> 1;
- aPos.Y() -= aSize.Height() >> 1;
+ maCenter = maLastMousePos = aPos;
+ aPos.X() -= aSize.Width() >> 1;
+ aPos.Y() -= aSize.Height() >> 1;
- SetPosSizePixel( aPos, aSize );
- SetWindowRegionPixel( rRegionBmp.CreateRegion( COL_BLACK, aRect ) );
+ SetPosSizePixel( aPos, aSize );
+ SetWindowRegionPixel( rRegionBmp.CreateRegion( COL_BLACK, aRect ) );
}
// ------------------------------------------------------------------------
void ImplWheelWindow::ImplCreateImageList()
{
- ResMgr* pResMgr = ImplGetResMgr();
- if( pResMgr )
- maImgList.InsertFromHorizontalBitmap
- ( ResId( SV_RESID_BITMAP_SCROLLBMP, *pResMgr ), 6, NULL );
+ ResMgr* pResMgr = ImplGetResMgr();
+ if( pResMgr )
+ maImgList.InsertFromHorizontalBitmap
+ ( ResId( SV_RESID_BITMAP_SCROLLBMP, *pResMgr ), 6, NULL
);
}
// ------------------------------------------------------------------------
void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode )
{
- if( nWheelMode != mnWheelMode )
- {
- mnWheelMode = nWheelMode;
-
- if( WHEELMODE_NONE == mnWheelMode )
- {
- if( IsVisible() )
- Hide();
- }
- else
- {
- if( !IsVisible() )
- Show();
-
- ImplDrawWheel();
- }
- }
+ if( nWheelMode != mnWheelMode )
+ {
+ mnWheelMode = nWheelMode;
+
+ if( WHEELMODE_NONE == mnWheelMode )
+ {
+ if( IsVisible() )
+ Hide();
+ }
+ else
+ {
+ if( !IsVisible() )
+ Show();
+
+ ImplDrawWheel();
+ }
+ }
}
// ------------------------------------------------------------------------
void ImplWheelWindow::ImplDrawWheel()
{
- sal_uInt16 nId;
-
- switch( mnWheelMode )
- {
- case( WHEELMODE_VH ): nId = 1; break;
- case( WHEELMODE_V ): nId = 2; break;
- case( WHEELMODE_H ): nId = 3; break;
- case( WHEELMODE_SCROLL_VH ):nId = 4; break;
- case( WHEELMODE_SCROLL_V ): nId = 5; break;
- case( WHEELMODE_SCROLL_H ): nId = 6; break;
- default: nId = 0; break;
- }
-
- if( nId )
- DrawImage( Point(), maImgList.GetImage( nId ) );
+ sal_uInt16 nId;
+
+ switch( mnWheelMode )
+ {
+ case( WHEELMODE_VH ): nId = 1; break;
+ case( WHEELMODE_V ): nId = 2; break;
+ case( WHEELMODE_H ): nId = 3; break;
+ case( WHEELMODE_SCROLL_VH ):nId = 4; break;
+ case( WHEELMODE_SCROLL_V ): nId = 5; break;
+ case( WHEELMODE_SCROLL_H ): nId = 6; break;
+ default: nId = 0; break;
+ }
+
+ if( nId )
+ DrawImage( Point(), maImgList.GetImage( nId ) );
}
// ------------------------------------------------------------------------
void ImplWheelWindow::ImplRecalcScrollValues()
{
- if( mnActDist < WHEEL_RADIUS )
- {
- mnActDeltaX = mnActDeltaY = 0L;
- mnTimeout = DEF_TIMEOUT;
- }
- else
- {
- sal_uLong nCurTime;
-
- // calc current time
- if( mnMaxWidth )
- {
- const double fExp = ( (double) mnActDist / mnMaxWidth ) * log10(
(double) MAX_TIME / MIN_TIME );
- nCurTime = (sal_uLong) ( MAX_TIME / pow( 10., fExp ) );
- }
- else
- nCurTime = MAX_TIME;
-
- if( !nCurTime )
- nCurTime = 1UL;
-
- if( mnRepaintTime <= nCurTime )
- mnTimeout = nCurTime - mnRepaintTime;
- else
- {
- long nMult = mnRepaintTime / nCurTime;
-
- if( !( mnRepaintTime % nCurTime ) )
- mnTimeout = 0UL;
- else
- mnTimeout = ++nMult * nCurTime - mnRepaintTime;
-
- double fValX = (double) mnActDeltaX * nMult;
- double fValY = (double) mnActDeltaY * nMult;
-
- if( fValX > LONG_MAX )
- mnActDeltaX = LONG_MAX;
- else if( fValX < LONG_MIN )
- mnActDeltaX = LONG_MIN;
- else
- mnActDeltaX = (long) fValX;
-
- if( fValY > LONG_MAX )
- mnActDeltaY = LONG_MAX;
- else if( fValY < LONG_MIN )
- mnActDeltaY = LONG_MIN;
- else
- mnActDeltaY = (long) fValY;
- }
- }
+ if( mnActDist < WHEEL_RADIUS )
+ {
+ mnActDeltaX = mnActDeltaY = 0L;
+ mnTimeout = DEF_TIMEOUT;
+ }
+ else
+ {
+ sal_uLong nCurTime;
+
+ // calculate current time
+ if( mnMaxWidth )
+ {
+ const double fExp = ( (double) mnActDist / mnMaxWidth )
* log10( (double) MAX_TIME / MIN_TIME );
+ nCurTime = (sal_uLong) ( MAX_TIME / pow( 10., fExp ) );
+ }
+ else
+ nCurTime = MAX_TIME;
+
+ if( !nCurTime )
+ nCurTime = 1UL;
+
+ if( mnRepaintTime <= nCurTime )
+ mnTimeout = nCurTime - mnRepaintTime;
+ else
+ {
+ long nMult = mnRepaintTime / nCurTime;
+
+ if( !( mnRepaintTime % nCurTime ) )
+ mnTimeout = 0UL;
+ else
+ mnTimeout = ++nMult * nCurTime - mnRepaintTime;
+
+ double fValX = (double) mnActDeltaX * nMult;
+ double fValY = (double) mnActDeltaY * nMult;
+
+ if( fValX > LONG_MAX )
+ mnActDeltaX = LONG_MAX;
+ else if( fValX < LONG_MIN )
+ mnActDeltaX = LONG_MIN;
+ else
+ mnActDeltaX = (long) fValX;
+
+ if( fValY > LONG_MAX )
+ mnActDeltaY = LONG_MAX;
+ else if( fValY < LONG_MIN )
+ mnActDeltaY = LONG_MIN;
+ else
+ mnActDeltaY = (long) fValY;
+ }
+ }
}
// ------------------------------------------------------------------------
PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY )
{
- PointerStyle eStyle;
- const sal_uInt16 nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
- const sal_Bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
- const sal_Bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
-
- if( bHorz || bVert )
- {
- if( mnActDist < WHEEL_RADIUS )
- {
- if( bHorz && bVert )
- eStyle = POINTER_AUTOSCROLL_NSWE;
- else if( bHorz )
- eStyle = POINTER_AUTOSCROLL_WE;
- else
- eStyle = POINTER_AUTOSCROLL_NS;
- }
- else
- {
- double fAngle = atan2( (double) -nDistY, nDistX ) / F_PI180;
-
- if( fAngle < 0.0 )
- fAngle += 360.;
-
- if( bHorz && bVert )
- {
- if( fAngle >= 22.5 && fAngle <= 67.5 )
- eStyle = POINTER_AUTOSCROLL_NE;
- else if( fAngle >= 67.5 && fAngle <= 112.5 )
- eStyle = POINTER_AUTOSCROLL_N;
- else if( fAngle >= 112.5 && fAngle <= 157.5 )
- eStyle = POINTER_AUTOSCROLL_NW;
- else if( fAngle >= 157.5 && fAngle <= 202.5 )
- eStyle = POINTER_AUTOSCROLL_W;
- else if( fAngle >= 202.5 && fAngle <= 247.5 )
- eStyle = POINTER_AUTOSCROLL_SW;
- else if( fAngle >= 247.5 && fAngle <= 292.5 )
- eStyle = POINTER_AUTOSCROLL_S;
- else if( fAngle >= 292.5 && fAngle <= 337.5 )
- eStyle = POINTER_AUTOSCROLL_SE;
- else
- eStyle = POINTER_AUTOSCROLL_E;
- }
- else if( bHorz )
- {
- if( fAngle >= 270. || fAngle <= 90. )
- eStyle = POINTER_AUTOSCROLL_E;
- else
- eStyle = POINTER_AUTOSCROLL_W;
- }
- else
- {
- if( fAngle >= 0. && fAngle <= 180. )
- eStyle = POINTER_AUTOSCROLL_N;
- else
- eStyle = POINTER_AUTOSCROLL_S;
- }
- }
- }
- else
- eStyle = POINTER_ARROW;
-
- return eStyle;
+ PointerStyle eStyle;
+ const sal_uInt16 nFlags =
ImplGetSVData()->maWinData.mnAutoScrollFlags;
+ const sal_Bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
+ const sal_Bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+
+ if( bHorz || bVert )
+ {
+ if( mnActDist < WHEEL_RADIUS )
+ {
+ if( bHorz && bVert )
+ eStyle = POINTER_AUTOSCROLL_NSWE;
+ else if( bHorz )
+ eStyle = POINTER_AUTOSCROLL_WE;
+ else
+ eStyle = POINTER_AUTOSCROLL_NS;
+ }
+ else
+ {
+ double fAngle = atan2( (double) -nDistY, nDistX ) /
F_PI180;
+
+ if( fAngle < 0.0 )
+ fAngle += 360.;
+
+ if( bHorz && bVert )
+ {
+ if( fAngle >= 22.5 && fAngle <= 67.5 )
+ eStyle = POINTER_AUTOSCROLL_NE;
+ else if( fAngle >= 67.5 && fAngle <= 112.5 )
+ eStyle = POINTER_AUTOSCROLL_N;
+ else if( fAngle >= 112.5 && fAngle <= 157.5 )
+ eStyle = POINTER_AUTOSCROLL_NW;
+ else if( fAngle >= 157.5 && fAngle <= 202.5 )
+ eStyle = POINTER_AUTOSCROLL_W;
+ else if( fAngle >= 202.5 && fAngle <= 247.5 )
+ eStyle = POINTER_AUTOSCROLL_SW;
+ else if( fAngle >= 247.5 && fAngle <= 292.5 )
+ eStyle = POINTER_AUTOSCROLL_S;
+ else if( fAngle >= 292.5 && fAngle <= 337.5 )
+ eStyle = POINTER_AUTOSCROLL_SE;
+ else
+ eStyle = POINTER_AUTOSCROLL_E;
+ }
+ else if( bHorz )
+ {
+ if( fAngle >= 270. || fAngle <= 90. )
+ eStyle = POINTER_AUTOSCROLL_E;
+ else
+ eStyle = POINTER_AUTOSCROLL_W;
+ }
+ else
+ {
+ if( fAngle >= 0. && fAngle <= 180. )
+ eStyle = POINTER_AUTOSCROLL_N;
+ else
+ eStyle = POINTER_AUTOSCROLL_S;
+ }
+ }
+ }
+ else
+ eStyle = POINTER_ARROW;
+
+ return eStyle;
}
// ------------------------------------------------------------------------
void ImplWheelWindow::Paint( const Rectangle& )
{
- ImplDrawWheel();
+ ImplDrawWheel();
}
// ------------------------------------------------------------------------
void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt )
{
- FloatingWindow::MouseMove( rMEvt );
-
- const Point aMousePos( OutputToScreenPixel( rMEvt.GetPosPixel() ) );
- const long nDistX = aMousePos.X() - maCenter.X();
- const long nDistY = aMousePos.Y() - maCenter.Y();
-
- mnActDist = (sal_uLong) hypot( (double) nDistX, nDistY );
-
- const PointerStyle eActStyle = ImplGetMousePointer( nDistX, nDistY );
- const sal_uInt16 nFlags =
ImplGetSVData()->maWinData.mnAutoScrollFlags;
- const sal_Bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
- const sal_Bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
- const sal_Bool bOuter = mnActDist > WHEEL_RADIUS;
-
- if( bOuter && ( maLastMousePos != aMousePos ) )
- {
- switch( eActStyle )
- {
- case( POINTER_AUTOSCROLL_N ): mnActDeltaX = +0L, mnActDeltaY =
+1L; break;
- case( POINTER_AUTOSCROLL_S ): mnActDeltaX = +0L, mnActDeltaY =
-1L; break;
- case( POINTER_AUTOSCROLL_W ): mnActDeltaX = +1L, mnActDeltaY =
+0L; break;
- case( POINTER_AUTOSCROLL_E ): mnActDeltaX = -1L, mnActDeltaY =
+0L; break;
- case( POINTER_AUTOSCROLL_NW ): mnActDeltaX = +1L, mnActDeltaY =
+1L; break;
- case( POINTER_AUTOSCROLL_NE ): mnActDeltaX = -1L, mnActDeltaY =
+1L; break;
- case( POINTER_AUTOSCROLL_SW ): mnActDeltaX = +1L, mnActDeltaY =
-1L; break;
- case( POINTER_AUTOSCROLL_SE ): mnActDeltaX = -1L, mnActDeltaY =
-1L; break;
-
- default:
- break;
- }
- }
-
- ImplRecalcScrollValues();
- maLastMousePos = aMousePos;
- SetPointer( eActStyle );
-
- if( bHorz && bVert )
- ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_VH : WHEELMODE_VH );
- else if( bHorz )
- ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_H : WHEELMODE_H );
- else
- ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_V : WHEELMODE_V );
+ FloatingWindow::MouseMove( rMEvt );
+
+ const Point aMousePos( OutputToScreenPixel( rMEvt.GetPosPixel() ) );
+ const long nDistX = aMousePos.X() - maCenter.X();
+ const long nDistY = aMousePos.Y() - maCenter.Y();
+
+ mnActDist = (sal_uLong) hypot( (double) nDistX, nDistY );
+
+ const PointerStyle eActStyle = ImplGetMousePointer( nDistX, nDistY
);
+ const sal_uInt16 nFlags =
ImplGetSVData()->maWinData.mnAutoScrollFlags;
+ const sal_Bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) !=
0;
+ const sal_Bool bVert = ( nFlags & AUTOSCROLL_VERT ) !=
0;
+ const sal_Bool bOuter = mnActDist > WHEEL_RADIUS;
+
+ if( bOuter && ( maLastMousePos != aMousePos ) )
+ {
+ switch( eActStyle )
+ {
+ case( POINTER_AUTOSCROLL_N ): mnActDeltaX = +0L,
mnActDeltaY = +1L; break;
+ case( POINTER_AUTOSCROLL_S ): mnActDeltaX = +0L,
mnActDeltaY = -1L; break;
+ case( POINTER_AUTOSCROLL_W ): mnActDeltaX = +1L,
mnActDeltaY = +0L; break;
+ case( POINTER_AUTOSCROLL_E ): mnActDeltaX = -1L,
mnActDeltaY = +0L; break;
+ case( POINTER_AUTOSCROLL_NW ): mnActDeltaX = +1L,
mnActDeltaY = +1L; break;
+ case( POINTER_AUTOSCROLL_NE ): mnActDeltaX = -1L,
mnActDeltaY = +1L; break;
+ case( POINTER_AUTOSCROLL_SW ): mnActDeltaX = +1L,
mnActDeltaY = -1L; break;
+ case( POINTER_AUTOSCROLL_SE ): mnActDeltaX = -1L,
mnActDeltaY = -1L; break;
+
+ default:
+ break;
+ }
+ }
+
+ ImplRecalcScrollValues();
+ maLastMousePos = aMousePos;
+ SetPointer( eActStyle );
+
+ if( bHorz && bVert )
+ ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_VH : WHEELMODE_VH );
+ else if( bHorz )
+ ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_H : WHEELMODE_H );
+ else
+ ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_V : WHEELMODE_V );
}
// ------------------------------------------------------------------------
void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt )
{
- if( mnActDist > WHEEL_RADIUS )
- GetParent()->EndAutoScroll();
- else
- FloatingWindow::MouseButtonUp( rMEvt );
+ if( mnActDist > WHEEL_RADIUS )
+ GetParent()->EndAutoScroll();
+ else
+ FloatingWindow::MouseButtonUp( rMEvt );
}
// ------------------------------------------------------------------------
IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG )
{
- if ( mnActDeltaX || mnActDeltaY )
- {
- Window* pWindow = GetParent();
- const Point aMousePos( pWindow->OutputToScreenPixel(
pWindow->GetPointerPosPixel() ) );
- Point aCmdMousePos( pWindow->ImplFrameToOutput(
aMousePos ) );
- CommandScrollData aScrollData( mnActDeltaX, mnActDeltaY );
- CommandEvent aCEvt( aCmdMousePos, COMMAND_AUTOSCROLL, sal_True,
&aScrollData );
- NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
-
- if ( !ImplCallPreNotify( aNCmdEvt ) )
- {
- const sal_uLong nTime = Time::GetSystemTicks();
+ if ( mnActDeltaX || mnActDeltaY )
+ {
+ Window* pWindow = GetParent();
+ const Point aMousePos(
pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() ) );
+ Point aCmdMousePos(
pWindow->ImplFrameToOutput( aMousePos ) );
+ CommandScrollData aScrollData( mnActDeltaX, mnActDeltaY );
+ CommandEvent aCEvt( aCmdMousePos,
COMMAND_AUTOSCROLL, sal_True, &aScrollData );
+ NotifyEvent aNCmdEvt( EVENT_COMMAND,
pWindow, &aCEvt );
+
+ if ( !ImplCallPreNotify( aNCmdEvt ) )
+ {
+ const sal_uLong nTime = Time::GetSystemTicks();
ImplDelData aDel( this );
- pWindow->Command( aCEvt );
+ pWindow->Command( aCEvt );
if( aDel.IsDead() )
return 0;
- mnRepaintTime = Max( Time::GetSystemTicks() - nTime, 1UL );
- ImplRecalcScrollValues();
- }
- }
+ mnRepaintTime = Max( Time::GetSystemTicks() - nTime,
1UL );
+ ImplRecalcScrollValues();
+ }
+ }
- if ( mnTimeout != mpTimer->GetTimeout() )
- mpTimer->SetTimeout( mnTimeout );
- mpTimer->Start();
+ if ( mnTimeout != mpTimer->GetTimeout() )
+ mpTimer->SetTimeout( mnTimeout );
+ mpTimer->Start();
- return 0L;
+ return 0L;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/source/window/scrwnd.hxx
b/main/vcl/source/window/scrwnd.hxx
index 6adc80c2a5..87707a8347 100644
--- a/main/vcl/source/window/scrwnd.hxx
+++ b/main/vcl/source/window/scrwnd.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include <vcl/floatwin.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/image.hxx>
@@ -64,7 +62,7 @@ private:
void ImplCreateImageList();
void ImplSetRegion( const Bitmap& rRegionBmp
);
- using Window::ImplGetMousePointer;
+ using Window::ImplGetMousePointer;
PointerStyle ImplGetMousePointer( long nDistX, long nDistY );
void ImplDrawWheel();
void ImplRecalcScrollValues();
@@ -82,7 +80,9 @@ public:
ImplWheelWindow( Window*
pParent );
~ImplWheelWindow();
- void ImplStop();
+ void ImplStop();
void ImplSetWheelMode( sal_uLong nWheelMode
);
sal_uLong ImplGetWheelMode() const {
return mnWheelMode; }
};
+
+/* vim: set noet sw=4 ts=4: */
