From 1584a52f6dfa5af1c84b342533f46a11330aed79 Mon Sep 17 00:00:00 2001 From: skyjake Date: Wed, 5 Jun 2013 14:16:13 +0300 Subject: [PATCH] Windows|Client|libgui: Adjusted fonts and font rasterizing The text rasterization bitmap's width was one pixel too small. Also changed the default Windows font. --- doomsday/client/data/defaultstyle.pack/fonts.dei | 2 +- doomsday/libgui/src/font.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doomsday/client/data/defaultstyle.pack/fonts.dei b/doomsday/client/data/defaultstyle.pack/fonts.dei index a62cb5cba9..6c77adf484 100644 --- a/doomsday/client/data/defaultstyle.pack/fonts.dei +++ b/doomsday/client/data/defaultstyle.pack/fonts.dei @@ -7,7 +7,7 @@ script { import Version, gui } font default condition "Version.OS == 'windows'" { - family: Verdana + family: Segoe UI size: 12pt weight: normal style: normal diff --git a/doomsday/libgui/src/font.cpp b/doomsday/libgui/src/font.cpp index 8ea9874433..7e840826ea 100644 --- a/doomsday/libgui/src/font.cpp +++ b/doomsday/libgui/src/font.cpp @@ -471,7 +471,7 @@ QImage Font::rasterize(String const &textLine, QColor fgColor(foreground.x, foreground.y, foreground.z, foreground.w); QColor bgColor(background.x, background.y, background.z, background.w); - QImage img(QSize(bounds.width(), + QImage img(QSize(bounds.width() + 1, de::max(duint(d->metrics->height()), bounds.height()) + 1), QImage::Format_ARGB32); img.fill(bgColor.rgba()); @@ -479,6 +479,11 @@ QImage Font::rasterize(String const &textLine, QPainter painter(&img); painter.setCompositionMode(QPainter::CompositionMode_Source); +/*#ifdef WIN32 + painter.setRenderHint(QPainter::Antialiasing); + painter.setRenderHint(QPainter::TextAntialiasing); +#endif*/ + int advance = 0; RichFormat::Iterator iter(format); while(iter.hasNext())