summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2010-01-02 15:41:03 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2010-01-02 15:41:03 (GMT)
commit949e4994e6117d060976e5f1492af6c731e5044c (patch)
treebb6732ed9d1f3b4328e17b08e959cf1b8cc2e094
parenta8f810f189c1948ce32cf32178f71013a85762c2 (diff)
downloadtk-949e4994e6117d060976e5f1492af6c731e5044c.zip
tk-949e4994e6117d060976e5f1492af6c731e5044c.tar.gz
tk-949e4994e6117d060976e5f1492af6c731e5044c.tar.bz2
Added point-size conversion, from Ubuntu port.
-rw-r--r--ChangeLog5
-rw-r--r--unix/tkUnixRFont.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e15dc71..c8dd1d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-01-02 Donal K. Fellows <dkf@users.sf.net>
+ * unix/tkUnixRFont.c (InitFont, TkpGetFontAttrsForChar): Apply some
+ patches already in use on Ubuntu. Makes the font size always report as
+ being in points, which is necessary for getting postscript generation
+ right.
+
* unix/tkUnixEvent.c (TransferXEventsToTcl): [Bug 1924761]: Use the
new cache mechanism to force the extraction of the string of a key
event from XIM at the right time rather than after queueing when it
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;
}