Mercurial > dwindows

changeset 1060:efa7d527adea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the actual Windows point size for a device... doing conversion as necessary.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 02 Jun 2011 23:55:38 +0000
parents 2f79f183ff03
children d91e09dc3865
files win/dw.c
diffstat 1 files changed, 16 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/win/dw.c	Thu Jun 02 21:48:16 2011 +0000
+++ b/win/dw.c	Thu Jun 02 23:55:38 2011 +0000
@@ -3995,21 +3995,24 @@
    SetParent(handle, newparent);
 }
 
-LOGFONT _get_logfont(char *fontname)
+LOGFONT _get_logfont(HWND handle, char *fontname)
 {
    int Italic, Bold;
    char *myFontName;
    int z, size = 9;
    LOGFONT lf;
+   HDC hdc = GetDC(handle);
+   
    for(z=0;z<strlen(fontname);z++)
    {
       if(fontname[z]=='.')
          break;
    }
-   size = atoi(fontname) + 5; /* no idea why this 5 needs to be added */
+   size = atoi(fontname);
+   lf.lfHeight = -MulDiv(size, GetDeviceCaps(hdc, LOGPIXELSY), 72);
+   ReleaseDC(handle, hdc);
    Italic = instring(" Italic", &fontname[z+1]);
    Bold = instring(" Bold", &fontname[z+1]);
-   lf.lfHeight = size;
    lf.lfWidth = 0;
    lf.lfEscapement = 0;
    lf.lfOrientation = 0;
@@ -4041,7 +4044,7 @@
 
    if(fontname != DefaultFont && fontname[0])
    {
-      LOGFONT lf = _get_logfont(fontname);
+      LOGFONT lf = _get_logfont(handle, fontname);
       hfont = CreateFontIndirect(&lf);
    }
    if(!hfont)
@@ -4119,7 +4122,7 @@
    char *italic = "";
     
    if(currfont && *currfont)
-      lf = _get_logfont(currfont);
+      lf = _get_logfont(NULL, currfont);
       
    cf.lStructSize = sizeof(cf);
    cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT;
@@ -4131,18 +4134,14 @@
       if ( str )
       {
          int height;
+         HDC hdc = GetDC(NULL);
+         
          if ( lf.lfWeight > FW_MEDIUM )
             bold = " Bold";
          if ( lf.lfItalic )
             italic = " Italic";
-         if ( lf.lfHeight <= 0 )
-            height = abs (lf.lfHeight );
-         else
-            /*
-             * we subtract 5 from a positive font height, because we (presumably)
-             * added 5 (in _acquire_font() above - don't know why )
-             */
-            height = lf.lfHeight - 5;
+         height = MulDiv(abs(lf.lfHeight), 72,  GetDeviceCaps (hdc, LOGPIXELSY));
+         ReleaseDC(NULL, hdc);
          sprintf( str, "%d.%s%s%s", height, lf.lfFaceName, bold, italic );
       }
    }
@@ -4182,18 +4181,14 @@
       if ( str )
       {
          int height;
+         HDC hdc = GetDC(handle);
+         
          if ( lf.lfWeight > FW_MEDIUM )
             bold = " Bold";
          if ( lf.lfItalic )
             italic = " Italic";
-         if ( lf.lfHeight <= 0 )
-            height = abs (lf.lfHeight );
-         else
-            /*
-             * we subtract 5 from a positive font height, because we (presumably)
-             * added 5 (in _acquire_font() above - don't know why )
-             */
-            height = lf.lfHeight - 5;
+         height = MulDiv(abs(lf.lfHeight), 72,  GetDeviceCaps (hdc, LOGPIXELSY));
+         ReleaseDC(handle, hdc);
          sprintf( str, "%d.%s%s%s", height, lf.lfFaceName, bold, italic );
       }
    }