diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-21 11:24:06 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-21 12:05:57 (GMT) |
| commit | cdb98c137db4d051e4b41c9fa4626c4c369cc0b1 (patch) | |
| tree | 64467f8d40b365560b8445f9a906d8997fcbc776 /src/gui/text/qfontdatabase_x11.cpp | |
| parent | 3be273fc751624fab078878904ad3cb483cd141f (diff) | |
| download | Qt-cdb98c137db4d051e4b41c9fa4626c4c369cc0b1.zip Qt-cdb98c137db4d051e4b41c9fa4626c4c369cc0b1.tar.gz Qt-cdb98c137db4d051e4b41c9fa4626c4c369cc0b1.tar.bz2 | |
Improved QFontInfo::pointSize() slightly on X11.
In non-GUI applications on X11, QFont and QFontInfo return different
point size because for QFontInfo, the point size is converted to pixel
size and back, but with different dpis. This commit improves the
situation for the case where font config is used, but the bug still
needs to be fixed properly by using the same dpi for all point<->pixel
size conversions.
Reviewed-by: Trond
Diffstat (limited to 'src/gui/text/qfontdatabase_x11.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp index 382c4fe..27ff003 100644 --- a/src/gui/text/qfontdatabase_x11.cpp +++ b/src/gui/text/qfontdatabase_x11.cpp @@ -752,7 +752,7 @@ QFontDef qt_FcPatternToQFontDef(FcPattern *pattern, const QFontDef &request) if (X11->display) dpi = QX11Info::appDpiY(); else - dpi = 96; // #### + dpi = qt_defaultDpiY(); } double size; |