Changeset 912 for trunk/src

Timestamp:

Sep 12, 1999, 6:52:46 PM (26 years ago)

Author:

cbratschi

Message:

set thumb length fix

File:

• trunk/src/comctl32/trackbar.c (modified) (5 diffs)

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.16 1999-08-22 13:20:26 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.17 1999-09-12 16:52:46 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -488 +488 @@
     if (!(dwStyle & TBS_NOTHUMB))
     {
-
       HBRUSH hbr,hbrOld;
       RECT thumb = infoPtr->rcThumb;
@@ -502 +501 @@
       } else
       {
-
         POINT points[6];
         RECT triangle;  /* for correct shadows of thumb */
@@ -732 +730 @@
     if (infoPtr->flags & TB_THUMBCHANGED)
     {
+      if (infoPtr->flags & TB_THUMBSIZECHANGED) TRACKBAR_CalcChannel(hwnd,infoPtr);
       TRACKBAR_CalcThumb(hwnd,infoPtr);
-      if (infoPtr->flags & TB_THUMBSIZECHANGED) TRACKBAR_CalcChannel(hwnd,infoPtr);
     }
     if (infoPtr->flags & TB_SELECTIONCHANGED) TRACKBAR_CalcSelection(hwnd,infoPtr);
@@ -1528 +1526 @@
 TRACKBAR_SetThumbLength (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
+    TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(hwnd);
 
     if (infoPtr->uThumbLen == (UINT)wParam) return 0;
 
-    if (!(GetWindowLongA (hwnd, GWL_STYLE) & TBS_FIXEDLENGTH)) return 0;
-
-    infoPtr->uThumbLen = (UINT)wParam;
-    infoPtr->flags |= TB_THUMBSIZECHANGED;
+    if (GetWindowLongA(hwnd,GWL_STYLE) & TBS_FIXEDLENGTH) return 0;
+
+    infoPtr->uThumbLen = MAX((UINT)wParam,THUMB_MINLEN);
+    infoPtr->flags |= TB_THUMBSIZECHANGED | TB_THUMBCHANGED;
 
     TRACKBAR_Refresh(hwnd);