Changeset 2782 for trunk/src/comctl32/status.c

Timestamp:

Feb 14, 2000, 6:31:40 PM (26 years ago)

Author:

cbratschi

Message:

merged comctl32.c and treeview with corel 20000212 + my newest code

File:

• trunk/src/comctl32/status.c (modified) (5 diffs)

trunk/src/comctl32/status.c

@@ -1 @@
-/* $Id: status.c,v 1.18 2000-02-10 18:51:19 cbratschi Exp $ */
+/* $Id: status.c,v 1.19 2000-02-14 17:31:39 cbratschi Exp $ */
 /*
  * Interface code to StatusWindow widget/control
@@ -900 +900 @@
     }
 
-    hdc = GetDC(0);
+    hdc = GetDC(hwnd);
     if (hdc) {
         TEXTMETRICA tm;
@@ -907 +907 @@
         hOldFont = SelectObject (hdc,infoPtr->hDefaultFont);
         GetTextMetricsA(hdc, &tm);
-        infoPtr->textHeight = tm.tmHeight;
+        infoPtr->textHeight = tm.tmHeight+tm.tmExternalLeading;
         SelectObject (hdc, hOldFont);
-        ReleaseDC(0, hdc);
+        ReleaseDC(hwnd, hdc);
     }
 
@@ -936 +936 @@
     width = rect.right - rect.left;
     infoPtr->height = infoPtr->textHeight + 4 + VERT_BORDER;
-//CB: todo: find bug!
+//CB: todo: find bug in font handling!
 infoPtr->height += 4;
     MoveWindow(hwnd,lpCreate->x,lpCreate->y-1,width,infoPtr->height,FALSE);
@@ -1070 +1070 @@
 
     infoPtr->hFont = (HFONT)wParam;
-    if (LOWORD(lParam) == TRUE) {
-        HDC hdc = GetDC (hwnd);
-        STATUSBAR_Refresh (hwnd, hdc);
-        ReleaseDC (hwnd, hdc);
+    if (LOWORD(lParam) == TRUE)
+    {
+      HDC hdc = GetDC (hwnd);
+      TEXTMETRICA tm;
+      HFONT hOldFont;
+
+      hOldFont = SelectObject(hdc,infoPtr->hFont);
+      GetTextMetricsA(hdc,&tm);
+      infoPtr->textHeight = tm.tmHeight+tm.tmExternalLeading;
+      SelectObject(hdc,hOldFont);
+
+      //CB: todo: move window
+
+      STATUSBAR_Refresh (hwnd, hdc);
+      ReleaseDC (hwnd, hdc);
     }