diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-02 15:41:03 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-02 15:41:03 (GMT) |
| commit | 6a7f77031e72e2af1b6e14c8dc3948cee17ca20f (patch) | |
| tree | bb6732ed9d1f3b4328e17b08e959cf1b8cc2e094 /unix/tkUnixRFont.c | |
| parent | 0343b4ad6fd53a1cdb11625ea07929ea2a8b5208 (diff) | |
| download | tk-6a7f77031e72e2af1b6e14c8dc3948cee17ca20f.zip tk-6a7f77031e72e2af1b6e14c8dc3948cee17ca20f.tar.gz tk-6a7f77031e72e2af1b6e14c8dc3948cee17ca20f.tar.bz2 | |
Added point-size conversion, from Ubuntu port.
Diffstat (limited to 'unix/tkUnixRFont.c')
| -rw-r--r-- | unix/tkUnixRFont.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index f580b2f..bc3d40a 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixRFont.c,v 1.24.2.2 2009/10/10 19:38:27 dkf Exp $ + * RCS: @(#) $Id: tkUnixRFont.c,v 1.24.2.3 2010/01/02 15:41:04 dkf Exp $ */ #include "tkUnixInt.h" @@ -257,6 +257,7 @@ InitFont( */ ftFont = GetFont(fontPtr, 0); fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed"); + fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size); GetTkFontAttributes(ftFont, &fontPtr->font.fa); GetTkFontMetrics(ftFont, &fontPtr->font.fm); @@ -570,6 +571,7 @@ TkpGetFontAttrsForChar( /* Actual font used to render the character */ GetTkFontAttributes(ftFont, faPtr); + faPtr->size = TkFontGetPoints(tkwin, faPtr->size); faPtr->underline = fontPtr->font.fa.underline; faPtr->overstrike = fontPtr->font.fa.overstrike; } |