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

Timestamp:

Nov 13, 1999, 5:42:43 PM (26 years ago)

Author:

cbratschi

Message:

merged with wine-991031, fixed edit bugs

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.21 1999-11-12 17:16:37 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.22 1999-11-13 16:42:42 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -8 +8 @@
  * Copyright 1994, 1996 Alexandre Julliard
  *
- * WINE version: 990923
+ * WINE version: 991031
  *
  * Status:  complete
@@ -1400 +1400 @@
     if (info->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL))
     {
-        new_flags = infoPtr->flags;
-        if (infoPtr->MinVal >= infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 ))
-        {
-            /* Hide or disable scroll-bar */
-            if (info->fMask & SIF_DISABLENOSCROLL)
-            {
-                new_flags = ESB_DISABLE_BOTH;
-                action |= SA_SSI_REFRESH;
-            }
-            else if (nBar != SB_CTL)
-            {
-                action = SA_SSI_HIDE;
-                goto done;
-            }
-        }
-        else  /* Show and enable scroll-bar */
-        {
-            new_flags = 0;
-            if (nBar != SB_CTL)
-                action |= SA_SSI_SHOW;
-        }
-
-        if (infoPtr->flags != new_flags) /* check arrow flags */
-        {
-            infoPtr->flags = new_flags;
-            action |= SA_SSI_REPAINT_ARROWS;
-        }
+      new_flags = infoPtr->flags;
+      if (infoPtr->MinVal >= infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 ))
+      {
+        /* Hide or disable scroll-bar */
+        if (info->fMask & SIF_DISABLENOSCROLL)
+        {
+          new_flags = ESB_DISABLE_BOTH;
+          action |= SA_SSI_REFRESH;
+        } else if (nBar != SB_CTL)
+        {
+          action = SA_SSI_HIDE;
+          goto done;
+        }
+      } else  /* Show and enable scroll-bar */
+      {
+        new_flags = 0;
+        if (nBar != SB_CTL) action |= SA_SSI_SHOW;
+        if (infoPtr->flags) action |= SA_SSI_REFRESH;
+      }
+
+      if (infoPtr->flags != new_flags) /* check arrow flags */
+      {
+        infoPtr->flags = new_flags;
+        action |= SA_SSI_REPAINT_ARROWS;
+      }
     }
 
@@ -1439 +1437 @@
           ShowScrollBar(hwnd,nBar,TRUE);
 
-        if(bRedraw && (action & SA_SSI_REFRESH))
+        if (bRedraw)
+        {
+          if (action & SA_SSI_REFRESH)
             SCROLL_RefreshScrollBar(hwndScroll,nBar,TRUE,TRUE);
-        else
-        {
-          if (action & SA_SSI_REPAINT_INTERIOR || action & SA_SSI_MOVE_THUMB)
-            SCROLL_RefreshScrollBar(hwndScroll,nBar,FALSE,TRUE);
-          if (action & SA_SSI_REPAINT_ARROWS )
-            SCROLL_RefreshScrollBar(hwndScroll,nBar,TRUE,FALSE);
+          else
+          {
+            if (action & (SA_SSI_REPAINT_INTERIOR | SA_SSI_MOVE_THUMB))
+              SCROLL_RefreshScrollBar(hwndScroll,nBar,FALSE,TRUE);
+            if (action & SA_SSI_REPAINT_ARROWS)
+              SCROLL_RefreshScrollBar(hwndScroll,nBar,TRUE,FALSE);
+          }
         }
     }
@@ -1540 +1541 @@
     return infoPtr->CurVal;
 }
+
+// CB: functions to get 32bit SB_THUMBTRACK position, for internal use
+
+BOOL IsScrollBarTracking(HWND hwnd,INT nBar)
+{
+  HWND hwndScroll = SCROLL_GetScrollHandle(hwnd,nBar);
+
+  return (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar);
+}
+
+INT GetScrollTrackPos(HWND hwnd,INT nBar)
+{
+  SCROLLBAR_INFO *infoPtr;
+
+  infoPtr = SCROLL_GetInfoPtr(SCROLL_GetScrollHandle(hwnd,nBar),nBar);
+  if (!infoPtr) return 0;
+
+  return (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) ? SCROLL_TrackingVal:infoPtr->CurVal;
+}
+
 /*************************************************************************
  *           SetScrollRange   (USER32.503)