[ros-diffs] [reactos] 01/01: [WIN32SS] Improve Drawing Scrollbars

[Joachim Henze]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00adb1a3f967ac7f5cd56…

commit 00adb1a3f967ac7f5cd56b4c39df72a7b3814603
Author:     Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Wed Mar 4 02:12:06 2020 +0100
Commit:     Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Wed Mar 4 02:12:06 2020 +0100

    [WIN32SS] Improve Drawing Scrollbars
    
    A very nice patch of JIRA user "I_kill_Bugs". Many many Thanks!
    
    It addresses:
    - CORE-14755 fixed, flashing scrollbar triangles (we know 131 affected apps just from
rapps!)
    - CORE-13931 fixed, FamiTracker invisible about-dlg
    - CORE-14685 improves a bit, but is not entirely fixed
    - CORE-11561 improves a bit, but is not entirely fixed
    - The patch avoids unnecessary redraws, speeds up GUI interaction and NSIS install
times
    
    Jim Tabor had no complains about it, I just did some white-space-tweaks on EOL and
indentation.
    
    FTR A testbot run (not on master but on 0.4.13-RC-48-g818e5bc)
    https://reactos.org/testman/compare.php?ids=71645,71666 VBox LGTM
    https://reactos.org/testman/compare.php?ids=71646,71667 KVM LGTM
    
    I felt tempted to port back, but decided to play safe and commit to master just.
---
 win32ss/user/ntuser/scrollbar.c | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c
index 325be6fe491..6bbc7ae7bc6 100644
--- a/win32ss/user/ntuser/scrollbar.c
+++ b/win32ss/user/ntuser/scrollbar.c
@@ -61,6 +61,9 @@ DBG_DEFAULT_CHANNEL(UserScrollbar);
 BOOL APIENTRY
 IntEnableScrollBar(BOOL Horz, PSCROLLBARINFO Info, UINT wArrows);
 
+static void
+IntRefeshScrollInterior(PWND pWnd, INT nBar, PSCROLLBARINFO psbi);
+
 
 /* Ported from WINE20020904 */
 /* Compute the scroll bar rectangle, in drawing coordinates (i.e. client coords for
SB_CTL, window coords for SB_VERT and
@@ -636,13 +639,21 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL
bRedraw)
          if ( co_UserShowScrollBar(Window, nBar, TRUE, TRUE) )
             return lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; /*
SetWindowPos() already did the painting */
       if (bRedraw)
-      { // FIXME: Arrows and interior.
-         RECTL UpdateRect = psbi->rcScrollBar;
-         UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left;
-         UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left;
-         UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top;
-         UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top;
-         co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME);
+      {
+         if (action & SA_SSI_REPAINT_ARROWS)
+         {  // Redraw the entire bar.
+            RECTL UpdateRect = psbi->rcScrollBar;
+            UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left;
+            UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left;
+            UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top;
+            UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top;
+            co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME);
+         }
+         else
+         {
+            // Redraw only the interior part of the bar.
+            IntRefeshScrollInterior(Window, nBar, psbi);
+         }
       } // FIXME: Arrows
 /*      else if( action & SA_SSI_REPAINT_ARROWS )
       {
@@ -1069,6 +1080,21 @@ IntScrollGetObjectId(INT SBType)
    return OBJID_CLIENT;
 }
 
+static void
+IntRefeshScrollInterior(PWND pWnd, INT nBar, PSCROLLBARINFO psbi)
+{
+   HDC hdc;
+   BOOL Vertical = ((nBar == SB_CTL) ? ((pWnd->style & SBS_VERT) != 0) : (nBar ==
SB_VERT));
+
+   hdc = UserGetDCEx(pWnd, NULL, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW));
+   if (hdc)
+   {  /* Get updated info. */
+      co_IntGetScrollBarInfo(pWnd, IntScrollGetObjectId(nBar), psbi);
+      IntDrawScrollInterior(pWnd, hdc, nBar, Vertical, psbi);
+      UserReleaseDC(pWnd, hdc, FALSE);
+   }
+}
+
 void
 IntDrawScrollBar(PWND Wnd, HDC DC, INT Bar)
 {