Changeset 3145 for trunk/src/comctl32/tooltips.cpp

Timestamp:

Mar 17, 2000, 6:13:26 PM (25 years ago)

Author:

cbratschi

Message:

trackbar buddy fix, tooltip enhancements

File:

• trunk/src/comctl32/tooltips.cpp (modified) (17 diffs)

trunk/src/comctl32/tooltips.cpp

@@ -1 @@
-/* $Id: tooltips.cpp,v 1.2 2000-02-25 09:57:19 achimha Exp $ */
+/* $Id: tooltips.cpp,v 1.3 2000-03-17 17:13:26 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -42 +42 @@
 
 
-static VOID
-TOOLTIPS_Refresh (HWND hwnd, HDC hdc)
+static VOID TOOLTIPS_Draw (HWND hwnd, HDC hdc)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(hwnd);
@@ -170 +169 @@
     }
     if (GetWindowLongA(hwnd,GWL_STYLE) & TTS_NOPREFIX) uFlags |= DT_NOPREFIX;
-//    TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
+    //TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
 
     hdc = GetDC(hwnd);
@@ -181 +180 @@
     size.cy = rc.bottom-rc.top+4+infoPtr->rcMargin.bottom+infoPtr->rcMargin.top;
 
-    //CB: optimize
-
     if (toolPtr->uFlags & TTF_ABSOLUTE)
     {
@@ -188 +185 @@
       rc.top  = infoPtr->yTrackPos;
 
-      if (toolPtr->uFlags & TTF_CENTERTIP)
+      if (toolPtr->uFlags & TTF_ALIGNMASK)
       {
-        rc.left -= (size.cx/2);
-        rc.top  -= (size.cy/2);
+        //CB: Odin only (Win32 does something similar but with an undocumented mechanism)
+
+        if (toolPtr->uFlags & TTF_ALIGNLEFT)
+          rc.left -= size.cx;
+        else if (toolPtr->uFlags & TTF_HCENTER)
+          rc.left -= size.cx/2;
+
+        if (toolPtr->uFlags & TTF_ALIGNTOP)
+          rc.top -= size.cy;
+        else if (toolPtr->uFlags & TTF_VCENTER)
+          rc.top -= size.cy/2;
+
+      } else
+      {
+        if (toolPtr->uFlags & TTF_CENTERTIP)
+        {
+          rc.left -= (size.cx/2);
+          rc.top  -= (size.cy/2);
+        }
       }
     } else
@@ -235 +249 @@
     }
 
-//    TRACE (tooltips, "pos %d - %d\n", rect.left, rect.top);
+    //TRACE (tooltips, "pos %d - %d\n", rect.left, rect.top);
 
     rc.right = rc.left+size.cx;
@@ -260 +274 @@
     if (GetWindowLongA (hwnd, GWL_STYLE) & TTS_NOPREFIX)
         uFlags |= DT_NOPREFIX;
-//    TRACE("\"%s\"\n", debugstr_w(infoPtr->szTipText));
+    //TRACE("\"%s\"\n", debugstr_w(infoPtr->szTipText));
 
     hdc = GetDC (hwnd);
@@ -364 +378 @@
     /* repaint the tooltip */
     hdc = GetDC (hwnd);
-    TOOLTIPS_Refresh (hwnd, hdc);
+    TOOLTIPS_Draw(hwnd, hdc);
     ReleaseDC (hwnd, hdc);
 
@@ -407 +421 @@
     if (infoPtr->nTrackTool == -1)
     {
-//    TRACE (tooltips, "invalid tracking tool (-1)!\n");
+      //TRACE (tooltips, "invalid tracking tool (-1)!\n");
       return;
     }
 
-//    TRACE (tooltips, "show tracking tooltip pre %d!\n", infoPtr->nTrackTool);
+    //TRACE (tooltips, "show tracking tooltip pre %d!\n", infoPtr->nTrackTool);
 
     TOOLTIPS_GetTipText(hwnd,infoPtr,infoPtr->nTrackTool);
@@ -421 +435 @@
     }
 
-//    TRACE (tooltips, "show tracking tooltip %d!\n", infoPtr->nTrackTool);
+    //TRACE (tooltips, "show tracking tooltip %d!\n", infoPtr->nTrackTool);
     toolPtr = &infoPtr->tools[infoPtr->nTrackTool];
 
@@ -429 +443 @@
     SendMessageA(toolPtr->hwnd,WM_NOTIFY,(WPARAM)toolPtr->uId,(LPARAM)&hdr);
 
-//    TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
+    //TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
 
     TOOLTIPS_CalcTipRect(hwnd,infoPtr,toolPtr,&rect);
@@ -438 +452 @@
 
     hdc = GetDC (hwnd);
-    TOOLTIPS_Refresh (hwnd, hdc);
+    TOOLTIPS_Draw(hwnd, hdc);
     ReleaseDC (hwnd, hdc);
 }
@@ -1740 +1754 @@
       if (infoPtr->nTrackTool != -1)
       {
-//      TRACE (tooltips, "activated!\n");
+        //TRACE (tooltips, "activated!\n");
         infoPtr->bTrackActive = TRUE;
         TOOLTIPS_TrackShow(hwnd,infoPtr);
@@ -1752 +1766 @@
       infoPtr->nTrackTool = -1;
 
-//      TRACE (tooltips, "deactivated!\n");
+      //TRACE (tooltips, "deactivated!\n");
     }
 
@@ -2090 +2104 @@
 
     hdc = (wParam == 0) ? BeginPaint (hwnd, &ps) : (HDC)wParam;
-    TOOLTIPS_Refresh (hwnd, hdc);
+    TOOLTIPS_Draw(hwnd, hdc);
     if (!wParam)
         EndPaint (hwnd, &ps);
@@ -2461 +2475 @@
     WNDCLASSA wndClass;
 
-//SvL: Don't check this now
-//    if (GlobalFindAtomA (TOOLTIPS_CLASSA)) return;
-
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS;
@@ -2480 +2491 @@
 TOOLTIPS_Unregister (VOID)
 {
-    if (GlobalFindAtomA (TOOLTIPS_CLASSA))
-        UnregisterClassA (TOOLTIPS_CLASSA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassA (TOOLTIPS_CLASSA, (HINSTANCE)NULL);
+}
+