Changeset 1047 for trunk/src

Timestamp:

Sep 25, 1999, 5:10:27 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/comctl32/hotkey.c

@@ -1 @@
-/* $Id: hotkey.c,v 1.9 1999-09-23 17:26:29 cbratschi Exp $ */
+/* $Id: hotkey.c,v 1.10 1999-09-25 15:10:27 cbratschi Exp $ */
 /*
  * Hotkey control
@@ -106 +106 @@
     TEXTMETRICA tm;
     HDC hdc;
+    RECT rect;
 
     /* allocate memory for info structure */
@@ -119 +120 @@
     infoPtr->fwCombInv = 0;
     infoPtr->fwModInv  = 0;
-    infoPtr->cursorPos.x = 3;
-    infoPtr->cursorPos.y = 3;
     infoPtr->bfModsDown = 0;
 
@@ -128 +127 @@
     infoPtr->nHeight = tm.tmHeight;
     ReleaseDC (hwnd, hdc);
+
+    GetClientRect(hwnd,&rect);
+    infoPtr->cursorPos.x = 0;
+    infoPtr->cursorPos.y = rect.bottom-tm.tmHeight;
 
     return 0;
@@ -303 +306 @@
   HideCaret(hwnd);
   GetClientRect(hwnd,&rect);
-  DrawEdge(hdc,&rect,EDGE_SUNKEN,BF_RECT | BF_ADJUST);
 
   //draw string
@@ -334 +336 @@
   DrawTextA(hdc,text,strlen(text),&newRect,DT_LEFT | DT_BOTTOM | DT_SINGLELINE | DT_CALCRECT);
   if (infoPtr->hFont) SelectObject(hdc,oldFont);
-  infoPtr->cursorPos.x = (newRect.right >= rect.right)? 3:newRect.right;
+  infoPtr->cursorPos.x = (newRect.right >= rect.right)? 0:newRect.right;
   SetCaretPos(infoPtr->cursorPos.x,infoPtr->cursorPos.y);
   ShowCaret(hwnd);