Changeset 5769 for trunk/src/user32/scroll.cpp

Timestamp:

May 20, 2001, 12:44:04 PM (24 years ago)

Author:

sandervl

Message:

SetScrollInfo fix

File:

• trunk/src/user32/scroll.cpp (modified) (7 diffs)

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.37 2000-10-08 18:45:36 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.38 2001-05-20 10:44:04 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -1207 +1207 @@
     UINT new_flags;
     INT action = 0;
+    BOOL bChangeParams = FALSE; /* don't show/hide scrollbar if params don't change */
 
     dprintf(("USER32: SetScrollInfo %x %d",hwnd,nBar));
@@ -1222 +1223 @@
             infoPtr->Page = info->nPage;
             action |= SA_SSI_REPAINT_INTERIOR;
+            bChangeParams = TRUE; 
         }
     }
@@ -1245 +1247 @@
             infoPtr->MinVal = 0;
             infoPtr->MaxVal = 0;
+            bChangeParams = TRUE; 
         }
         else
@@ -1254 +1257 @@
                 infoPtr->MinVal = info->nMin;
                 infoPtr->MaxVal = info->nMax;
-            }
+                bChangeParams = TRUE; 
+           }
         }
     }
@@ -1291 +1295 @@
           new_flags = ESB_DISABLE_BOTH;
           action |= SA_SSI_REFRESH;
-        } else if (nBar != SB_CTL)
+        } 
+        else 
+        if (nBar != SB_CTL && bChangeParams)
         {
           action = SA_SSI_HIDE;
@@ -1297 +1303 @@
           goto done;
         }
-      } else  /* Show and enable scroll-bar */
+      } 
+      else  /* Show and enable scroll-bar */
       {
         new_flags = 0;
-        if (nBar != SB_CTL) action |= SA_SSI_SHOW;
+        if (nBar != SB_CTL && bChangeParams) action |= SA_SSI_SHOW;
         if (infoPtr->flags) action |= SA_SSI_REFRESH;
       }