delegate RenderContext, invalidate - prgsbar, scrbar

Change-Id: I05d68be744044cc82c0397fac25518a53c270761

2 files changed, 11 insertions, 8 deletions

diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 8bdf2fe9d850..609911cbbced 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -27,8 +27,9 @@
 
 void ProgressBar::ImplInit()
 {
-    mnPercent   = 0;
-    mbCalcNew   = true;
+    mnPercent = 0;
+    mnPreviousPercent = 0;
+    mbCalcNew = true;
 
     ImplInitSettings( true, true, true );
 }
@@ -116,7 +117,7 @@ void ProgressBar::ImplInitSettings( bool bFont,
     }
 }
 
-void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc )
+void ProgressBar::ImplDrawProgress(vcl::RenderContext& /*rRenderContext*/, sal_uInt16 nOldPerc, sal_uInt16 nNewPerc)
 {
     if ( mbCalcNew )
     {
@@ -145,9 +146,9 @@ void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc )
                     Rectangle( Point(), GetSizePixel() ) );
 }
 
-void ProgressBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void ProgressBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
 {
-    ImplDrawProgress( 0, mnPercent );
+    ImplDrawProgress(rRenderContext, mnPreviousPercent, mnPercent);
 }
 
 void ProgressBar::Resize()
@@ -165,6 +166,7 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent )
     {
         mbCalcNew = true;
         mnPercent = nNewPercent;
+        mnPreviousPercent = 0;
         if ( IsReallyVisible() )
         {
             Invalidate();
@@ -173,8 +175,9 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent )
     }
     else
     {
-        ImplDrawProgress( mnPercent, nNewPercent );
+        mnPreviousPercent = mnPercent;
         mnPercent = nNewPercent;
+        Invalidate();
     }
 }
 
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 6f883bf6e2a8..0d717833c3fb 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1120,9 +1120,9 @@ void ScrollBar::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-void ScrollBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void ScrollBar::Paint( vcl::RenderContext& rRenderContext, const Rectangle& )
 {
-    ImplDraw( SCRBAR_DRAW_ALL, this );
+    ImplDraw(SCRBAR_DRAW_ALL, &rRenderContext);
 }
 
 void ScrollBar::Resize()