summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <dkf@noemail.net>2010-01-02 15:43:51 (GMT)
committerdkf <dkf@noemail.net>2010-01-02 15:43:51 (GMT)
commitb06ce842a3fc3b9f9dc5bc29f95c42ad338faab8 (patch)
tree87684d2091f356d299ec8535a9a56498b29fba99
parent0609350545c7a61ae16e0cf0d6a898b544a98565 (diff)
downloadtk-b06ce842a3fc3b9f9dc5bc29f95c42ad338faab8.zip
tk-b06ce842a3fc3b9f9dc5bc29f95c42ad338faab8.tar.gz
tk-b06ce842a3fc3b9f9dc5bc29f95c42ad338faab8.tar.bz2
Added point-size conversion, from Ubuntu port.
FossilOrigin-Name: eeffd2eab4d2cafa47bea10b057c0ad47d53e070
-rw-r--r--ChangeLog5
-rw-r--r--unix/tkUnixRFont.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3af8fe4..ada0606 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 5e62ffa..081e6fd 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.30 2009/10/10 17:42:50 dkf Exp $
+ * RCS: @(#) $Id: tkUnixRFont.c,v 1.31 2010/01/02 15:43:51 dkf Exp $
*/
#include "tkUnixInt.h"
@@ -286,6 +286,7 @@ InitFont(
ftFont = GetFont(fontPtr, 0, 0.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);
@@ -605,6 +606,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;
}