Author: vfr Date: Wed Dec 29 15:25:15 2010 New Revision: 37036 URL: http://www.lyx.org/trac/changeset/37036
Log: branch: Fix bug #7187: Font painting problems with emulated scaling. When creating the QFontMetrics object, we should specify a QPaintDevice. 0 is a paint device which is screen-compatible or pixmap-compatible. This makes sure that the correct DPI is used in font metrics calculations. see r37030, and http://bugreports.qt.nokia.com/browse/QTBUG-16331. Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiFontMetrics.cpp lyx-devel/branches/BRANCH_1_6_X/status.16x Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiFontMetrics.cpp ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiFontMetrics.cpp Wed Dec 29 14:50:22 2010 (r37035) +++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiFontMetrics.cpp Wed Dec 29 15:25:15 2010 (r37036) @@ -49,13 +49,13 @@ // See comment in QLPainter::text() for more explanation. GuiFontMetrics::GuiFontMetrics(QFont const & font) -: metrics_(font), smallcaps_metrics_(font), smallcaps_shape_(false) +: metrics_(font, 0), smallcaps_metrics_(font), smallcaps_shape_(false) { } GuiFontMetrics::GuiFontMetrics(QFont const & font, QFont const & smallcaps_font) -: metrics_(font), smallcaps_metrics_(smallcaps_font), smallcaps_shape_(true) +: metrics_(font, 0), smallcaps_metrics_(smallcaps_font), smallcaps_shape_(true) { } Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/status.16x Wed Dec 29 14:50:22 2010 (r37035) +++ lyx-devel/branches/BRANCH_1_6_X/status.16x Wed Dec 29 15:25:15 2010 (r37036) @@ -81,6 +81,9 @@ - Fix crash when removing a math macro argument while instant preview is active (bug 7090). +- Fix the painting of the workarea for a non-standard DPI and using + emulated scaling on Windows Vista and Windows 7 (bug 7187). + - Fix insertion of a user math macro through the math-insert lfun when a selection is present (bug 6939).
