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

Timestamp:

Jun 30, 1999, 5:52:19 PM (26 years ago)

Author:

cbratschi

Message:

unicode and other changes

File:

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

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.9 1999-06-28 15:46:28 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.10 1999-06-30 15:52:18 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -67 +67 @@
 #define SCROLL_TIMER_ID 1
 
+/* Tooltips */
+
+#define TOOLTIP_XSPACE 5
+#define TOOLTIP_YSPACE 5
+
 static BOOL TRACKBAR_SendNotify (HWND hwnd, UINT code);
 
@@ -78 +83 @@
       COMCTL32_Free(infoPtr->tics);
       infoPtr->tics = NULL;
+
       infoPtr->uNumTics = 0;
       return;
@@ -1570 +1576 @@
 
     return 0;
+}
+
+/* pt intialized with cursor position */
+
+static VOID TRACKBAR_CalcToolTipPos(HWND hwnd,DWORD dwStyle,TRACKBAR_INFO *infoPtr,POINT *pt)
+{
+  if (dwStyle & TBS_VERT)
+  {
+    pt->x += 5;
+    pt->y += 15;
+  } else
+  {
+    pt->x += 15;
+    pt->y += 5;
+  }
 }
 
@@ -1613 +1634 @@
 
            GetCursorPos(&pt);
+           TRACKBAR_CalcToolTipPos(hwnd,dwStyle,infoPtr,&pt);
            SendMessageA(infoPtr->hwndToolTip,TTM_TRACKPOSITION,0,(LPARAM)MAKELPARAM(pt.x,pt.y));
 
@@ -1906 +1928 @@
       ti.lpszText = (LPSTR)buf;
       GetCursorPos(&pt);
+      TRACKBAR_CalcToolTipPos(hwnd,dwStyle,infoPtr,&pt);
 
       SendMessageA(infoPtr->hwndToolTip,TTM_UPDATETIPTEXTA,0,(LPARAM)&ti);
-      if (dwStyle & TBS_VERT)
-      {
-        SendMessageA(infoPtr->hwndToolTip,TTM_TRACKPOSITION,0,(LPARAM)MAKELPARAM(pt.x+5,pt.y+15)); //CB: optimize
-      } else
-      {
-        SendMessageA(infoPtr->hwndToolTip,TTM_TRACKPOSITION,0,(LPARAM)MAKELPARAM(pt.x+15,pt.y+5)); //CB: optimize
-      }
+      SendMessageA(infoPtr->hwndToolTip,TTM_TRACKPOSITION,0,(LPARAM)MAKELPARAM(pt.x,pt.y));
     }