Skip to content

C
core
Kaydet (Commit) 9ae37b8e authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

refactor WheelWindow to use RenderContex 

Change-Id: I59a7b31772e60a4da56b35e679928d8238b3d420
üst 56a45fcf
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 15 deletions
vcl/source/window/scrwnd.cxx
Dosyayı görüntüle @ 9ae37b8e
...@@ -142,28 +142,42 @@ void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode ) ...@@ -142,28 +142,42 @@ void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode )
if( !IsVisible() ) if( !IsVisible() )
Show(); Show();
ImplDrawWheel(); Invalidate();
} }
} }
} }
void ImplWheelWindow::ImplDrawWheel() void ImplWheelWindow::ImplDrawWheel(vcl::RenderContext& rRenderContext)
{ {
sal_uInt16 nId; sal_uInt16 nId;
switch( mnWheelMode ) switch (mnWheelMode)
{ {
case( WHEELMODE_VH ): nId = 1; break; case WHEELMODE_VH:
case( WHEELMODE_V ): nId = 2; break; nId = 1;
case( WHEELMODE_H ): nId = 3; break; break;
case( WHEELMODE_SCROLL_VH ):nId = 4; break; case WHEELMODE_V:
case( WHEELMODE_SCROLL_V ): nId = 5; break; nId = 2;
case( WHEELMODE_SCROLL_H ): nId = 6; break; break;
default: nId = 0; 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 ) if (nId)
DrawImage( Point(), maImgList.GetImage( nId ) ); rRenderContext.DrawImage(Point(), maImgList.GetImage(nId));
} }
void ImplWheelWindow::ImplRecalcScrollValues() void ImplWheelWindow::ImplRecalcScrollValues()
...@@ -286,9 +300,9 @@ PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY ) ...@@ -286,9 +300,9 @@ PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY )
return eStyle; return eStyle;
} }
void ImplWheelWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) void ImplWheelWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{ {
ImplDrawWheel(); ImplDrawWheel(rRenderContext);
} }
void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt ) void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt )
......
vcl/source/window/scrwnd.hxx
Dosyayı görüntüle @ 9ae37b8e
...@@ -56,7 +56,7 @@ private: ...@@ -56,7 +56,7 @@ private:
void ImplSetRegion( const Bitmap& rRegionBmp ); void ImplSetRegion( const Bitmap& rRegionBmp );
using Window::ImplGetMousePointer; using Window::ImplGetMousePointer;
PointerStyle ImplGetMousePointer( long nDistX, long nDistY ); PointerStyle ImplGetMousePointer( long nDistX, long nDistY );
void ImplDrawWheel(); void ImplDrawWheel(vcl::RenderContext& rRenderContext);
void ImplRecalcScrollValues(); void ImplRecalcScrollValues();
DECL_LINK_TYPED(ImplScrollHdl, Timer *, void); DECL_LINK_TYPED(ImplScrollHdl, Timer *, void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment