diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-23 10:46:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-23 10:46:26 (GMT) |
| commit | 936425eee091070d4fa71676f00ce0105f093f03 (patch) | |
| tree | 122d9c026906169f6a4be0e395227b9fe86e4006 /unix | |
| parent | 684d52732c1e4f25266691aa37e6db374e1219bb (diff) | |
| parent | ce84448c05bb61135f0cebd1a812f3e4496f62bd (diff) | |
| download | tk-936425eee091070d4fa71676f00ce0105f093f03.zip tk-936425eee091070d4fa71676f00ce0105f093f03.tar.gz tk-936425eee091070d4fa71676f00ce0105f093f03.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixRFont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 9c1116d..ccf77a3 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -447,7 +447,7 @@ TkpGetFontFromAttributes( if (faPtr->size > 0.0) { XftPatternAddDouble(pattern, XFT_SIZE, faPtr->size); } else if (faPtr->size < 0.0) { - XftPatternAddDouble(pattern, XFT_PIXEL_SIZE, -faPtr->size); + XftPatternAddDouble(pattern, XFT_SIZE, TkFontGetPoints(tkwin, faPtr->size)); } else { XftPatternAddDouble(pattern, XFT_SIZE, 12.0); } |