summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixFont.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-18 12:19:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-18 12:19:10 (GMT)
commit87d12d1ccc63df37fd805599bf29388c1d164e36 (patch)
tree3f3352b166163e06c4fa6d647bc34651c34bc1a1 /unix/tkUnixFont.c
parentbb089fa3ae014082fd1642a5c932f8c0c7422924 (diff)
parent6409149a9a89dbed7c247ed2b0e7e4317277da4a (diff)
downloadtk-87d12d1ccc63df37fd805599bf29388c1d164e36.zip
tk-87d12d1ccc63df37fd805599bf29388c1d164e36.tar.gz
tk-87d12d1ccc63df37fd805599bf29388c1d164e36.tar.bz2
merge trunk.
Make "font actual" return integers, for compatibility.
Diffstat (limited to 'unix/tkUnixFont.c')
-rw-r--r--unix/tkUnixFont.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index a447ec7..e2ce2bc 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -2773,7 +2773,7 @@ GetScreenFont(
}
*str = '\0';
sprintf(buf, "%.200s-%d-*-*-*-*-*%s", nameList[bestIdx[1]],
- (int)(-wantPtr->fa.size-0.5), rest);
+ (int)(-wantPtr->fa.size+0.5), rest);
*str = '-';
fontStructPtr = XLoadQueryFont(display, buf);
bestScore[1] = INT_MAX;