Changeset 110 for trunk/src/comctl32/trackbar.c

Timestamp:

Jun 16, 1999, 10:25:45 PM (26 years ago)

Author:

cbratschi

Message:

comctl32 wine conversion bugs fixed
trackbar: TRACKBAR_Draw prototype

File:

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

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.4 1999-06-16 15:29:27 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.5 1999-06-16 20:25:44 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -15 +15 @@
  *   - better tic handling.
  *   - more notifications.
+ *   - implement TRACKBAR_Draw with inUpdate
  *
  */
@@ -345 +346 @@
 }
 
-
-static VOID
-TRACKBAR_Refresh (HWND hwnd, HDC hdc)
+//draw the trackbar
+
+static VOID TRACKBAR_Draw(HWND hwnd,HDC hdc,INT lastPos,BOOL inUpdate)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
@@ -356 +357 @@
 
     GetClientRect (hwnd, &rcClient);
-    hBrush = CreateSolidBrush (infoPtr->clrBk);
-    FillRect (hdc, &rcClient, hBrush);
-    DeleteObject (hBrush);
+    if (!inUpdate)
+    {
+      hBrush = CreateSolidBrush (infoPtr->clrBk);
+      FillRect (hdc, &rcClient, hBrush);
+      DeleteObject (hBrush);
+    }
 
     if (infoPtr->flags & TB_DRAGPOSVALID)  {
@@ -478 +482 @@
 }
 
+//update display
+
+static VOID TRACKBAR_Update(HWND hwnd,INT lastPos)
+{
+   TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
+   HDC hdc;
+
+   if (infoPtr->flags & TB_DRAGPOSVALID && lastPos == infoPtr->dragPos) return;
+   if (!infoPtr->flags & TB_DRAGPOSVALID && lastPos == infoPtr->nPos) return;
+   hdc = GetDC(hwnd);
+   TRACKBAR_Draw(hwnd,hdc,lastPos,TRUE);
+   ReleaseDC(hwnd,hdc);
+}
+
+//redraw everything
+
+static VOID TRACKBAR_Refresh (HWND hwnd)
+{
+   HDC hdc;
+
+   hdc = GetDC (hwnd);
+   TRACKBAR_Draw(hwnd,hdc,0,FALSE);
+   ReleaseDC(hwnd,hdc);
+}
 
 static VOID
@@ -541 +569 @@
     infoPtr->flags |= TB_SELECTIONCHANGED;
 
-    if ((BOOL)wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if ((BOOL)wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -559 +586 @@
     }
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -811 +837 @@
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
 
+    INT lastPos = infoPtr->nPos;
     infoPtr->nPos = (INT)LOWORD(lParam);
 
@@ -820 +847 @@
     infoPtr->flags |= TB_THUMBPOSCHANGED;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Update(hwnd,lastPos);
 
     return 0;
@@ -849 +875 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -872 +897 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -895 +919 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -912 +935 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd); //CB: necessary?
 
     return 0;
@@ -935 +958 @@
         infoPtr->nSelMax = infoPtr->nRangeMax;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
 
@@ -957 +979 @@
         infoPtr->nSelMax = infoPtr->nRangeMax;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -978 +999 @@
         infoPtr->nSelMin = infoPtr->nRangeMin;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -995 +1015 @@
     infoPtr->flags |= TB_THUMBSIZECHANGED;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -1015 +1035 @@
     infoPtr->tics[infoPtr->uNumTics-1]=nPos;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd);
 
     return TRUE;
@@ -1149 +1169 @@
     infoPtr->flags &= ~TB_DRAG_MODE;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd); //CB: make changes here
 
     return 0;
@@ -1215 +1235 @@
     if (prevPos!=infoPtr->nPos) {
         infoPtr->flags |= TB_THUMBPOSCHANGED;
-        InvalidateRect (hwnd, NULL, FALSE);
+        TRACKBAR_Update(hwnd,prevPos);
     }
 
@@ -1247 +1267 @@
     }
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    //TRACKBAR_Refresh(hwnd); //CB: nothing changed
 
     return 0;
@@ -1259 +1279 @@
 
     if (infoPtr->flags & TB_DRAGPOSVALID) {
+        int lastPos = infoPtr->nPos;
         infoPtr->nPos=infoPtr->dragPos;
-        InvalidateRect (hwnd, NULL, FALSE);
+        TRACKBAR_Update(hwnd,lastPos);
     }
 
@@ -1277 +1298 @@
 
     hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
-    TRACKBAR_Refresh (hwnd, hdc);
+    TRACKBAR_Draw(hwnd,hdc,0,FALSE);
     if(!wParam)
         EndPaint (hwnd, &ps);
@@ -1292 +1313 @@
     infoPtr->bFocus = TRUE;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd); //CB: make changes here
 
     return 0;
@@ -1332 +1353 @@
     DOUBLE dragPos;
     char buf[80];
+    INT lastDragPos;
 
 //    TRACE (trackbar, "%x\n",wParam);
@@ -1344 +1366 @@
 
     SetCapture (hwnd);
+    lastDragPos = infoPtr->dragPos;
     dragPos = TRACKBAR_ConvertPlaceToPosition (infoPtr, clickPlace,
                                                dwStyle & TBS_VERT);
@@ -1377 +1400 @@
     }
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Update(hwnd,lastDragPos);
     UpdateWindow (hwnd);
 
@@ -1438 +1461 @@
     if (pos!=infoPtr->nPos) {
         infoPtr->flags |=TB_THUMBPOSCHANGED;
-        InvalidateRect (hwnd, NULL, FALSE);
+        TRACKBAR_Update(hwnd,pos);
     }