Changeset 621 for trunk/src

Timestamp:

Aug 22, 1999, 3:20:26 PM (26 years ago)

Author:

cbratschi

Message:

buddy fix, improved mouse down on thumb

File:

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

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.15 1999-08-21 12:10:02 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.16 1999-08-22 13:20:26 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -972 +972 @@
     INT x, y;
 
-    GetClientRect(hwnd,&rcSelf);
-    MapWindowPoints(hwnd,hwndParent,(LPPOINT)&rcSelf,2);
+    GetWindowRect(hwnd,&rcSelf);
 
     /* align buddy left or above */
     if (infoPtr->hwndBuddyLA)
     {
-      GetClientRect(infoPtr->hwndBuddyLA,&rcBuddy);
-      MapWindowPoints(infoPtr->hwndBuddyLA,hwndParent,(LPPOINT)&rcBuddy,2);
+      GetWindowRect(infoPtr->hwndBuddyLA,&rcBuddy);
 
       if (dwStyle & TBS_VERT)
       { //above
-        x = (infoPtr->rcChannel.right+infoPtr->rcChannel.left)/2-
-            (rcBuddy.right-rcBuddy.left)/2+rcSelf.left; //CB: right?
+        x = rcSelf.left-(rcBuddy.right-rcBuddy.left)/2+infoPtr->rcChannel.left+(infoPtr->rcChannel.right-infoPtr->rcChannel.left)/2;
         y = rcSelf.top-(rcBuddy.bottom-rcBuddy.top);
       } else
       { //left
-        x = rcSelf.left-(rcBuddy.right-rcBuddy.left);
-        y = (infoPtr->rcChannel.bottom+infoPtr->rcChannel.top)/2 -
-            (rcBuddy.bottom-rcBuddy.top)/2+rcSelf.top; //CB: right?
+        x = rcSelf.left+infoPtr->rcChannel.left-(rcBuddy.right-rcBuddy.left)/2;
+        y = rcSelf.top-(rcBuddy.bottom-rcBuddy.top);
       }
 
@@ -1000 +996 @@
     if (infoPtr->hwndBuddyRB)
     {
-      GetClientRect(infoPtr->hwndBuddyRB,&rcBuddy);
-      MapWindowPoints(infoPtr->hwndBuddyRB,hwndParent,(LPPOINT)&rcBuddy,2);
+      GetWindowRect(infoPtr->hwndBuddyRB,&rcBuddy);
 
       if (dwStyle & TBS_VERT)
       { //below
-        x = (infoPtr->rcChannel.right+infoPtr->rcChannel.left)/2-
-            (rcBuddy.right-rcBuddy.left)/2+rcSelf.left; //CB: right?
+        x = rcSelf.left-(rcBuddy.right-rcBuddy.left)/2+infoPtr->rcChannel.left+(infoPtr->rcChannel.right-infoPtr->rcChannel.left)/2;
         y = rcSelf.bottom;
       } else
       {
-        x = rcSelf.right;
-        y = (infoPtr->rcChannel.bottom+infoPtr->rcChannel.top)/2-
-            (rcBuddy.bottom-rcBuddy.top)/2+rcSelf.top; //CB: right?
+        x = rcSelf.right-infoPtr->rcChannel.left-(rcBuddy.right-rcBuddy.left)/2;
+        y = rcSelf.top-(rcBuddy.bottom-rcBuddy.top);
       }