Changeset 7691 for trunk/src

Timestamp:

Dec 26, 2001, 8:05:35 PM (24 years ago)

Author:

achimha

Message:

read system font height from graphics driver instead of hardcoding - only enabled for menus

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (3 diffs)
• pmwindow.h (modified) (2 diffs)
• user32.cpp (modified) (3 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.165 2001-11-20 09:53:56 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.166 2001-12-26 19:05:34 achimha Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -71 +71 @@
        HWND  hwndCD = 0;
 
+// this holds the font height that the display driver returns using DevQueryCaps
+// 13 would be small fonts, 16 medium fonts and 20 large fonts
+LONG CapsCharHeight = 0;
+
 // Note:
 // For a "lonekey"-press of AltGr, we only receive WM_KEYUP
@@ -204 +208 @@
 
     DevQueryCaps(hdc, CAPS_COLOR_BITCOUNT, 1, (PLONG)&ScreenBitsPerPel);
+
+    // query the font height to find out whether we have small or large fonts
+    DevQueryCaps(hdc, CAPS_GRAPHICS_CHAR_HEIGHT, 1, (PLONG)&CapsCharHeight);
+
     DevCloseDC(hdc);
 

trunk/src/user32/pmwindow.h

@@ -1 @@
-/* $Id: pmwindow.h,v 1.14 2001-11-20 09:53:57 sandervl Exp $ */
+/* $Id: pmwindow.h,v 1.15 2001-12-26 19:05:35 achimha Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -27 +27 @@
 extern BOOL  fOS2Look;
 extern HWND  hwndCD;
+extern LONG CapsCharHeight;
 
 #define TFOS_LEFT                    0x0001

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.117 2001-12-26 14:47:22 achimha Exp $ */
+/* $Id: user32.cpp,v 1.118 2001-12-26 19:05:35 achimha Exp $ */
 
 /*
@@ -746 +746 @@
                         lpLogFont->lfFaceName[sizeof(lpLogFont->lfFaceName)-1] = 0;
                         lpLogFont->lfWeight = FW_NORMAL;
-                        // AH 2001-12-26 special case for WarpSans
-                        if (strncmp(lpLogFont->lfFaceName, "WarpSans", 8) == 0)
-                            lpLogFont->lfHeight = 9;
-                        else
-                            lpLogFont->lfHeight = 16; //atoi(fontname);
+
+                        // AH 2001-12-26 use the font size returned by the graphics
+                        // driver as the font height. This will take font size settings
+                        // such as small, medium and large fonts into account
+                        lpLogFont->lfHeight = CapsCharHeight;
                     }
                     else fFound = FALSE;
@@ -758 +758 @@
                                       lpLogFont->lfFaceName, LF_FACESIZE);
                     lpLogFont->lfWeight = FW_BOLD;
-                    lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 16);
+                    // AH 2001-12-26 take graphics driver font size setting
+                    lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", CapsCharHeight);
                 }
                 lpLogFont->lfWidth = 0;