Changeset 7691 for trunk/src/user32/user32.cpp

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

File:

• trunk/src/user32/user32.cpp (modified) (3 diffs)

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;