+2005-01-07 Ruurd Reitsma <rareitsma@yahoo.com>
+
+ * qfont_metrics.C (ascent, descent): correct the metrics returned
+ by Qt/Win 3.2.1 non-commercial edition.
+
2005-01-06 Lars Gullik Bjonnes <larsbj@gullik.net>
* QDocument.C:
if (!lyx_gui::use_gui)
return 1;
QRect const & r = metrics(f).boundingRect(c);
+ // Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
+ // value by the height: (x, -y-height, width, height).
+ // Other versions return: (x, -y, width, height)
+#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
+ return -(r.top() + r.height());
+#else
return -r.top();
+#endif
}
if (!lyx_gui::use_gui)
return 1;
QRect const & r = metrics(f).boundingRect(c);
- return r.bottom()+1;
+ // Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
+ // value by the height: (x, -y-height, width, height).
+ // Other versions return: (x, -y, width, height)
+#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
+ return r.bottom() + r.height() + 1;
+#else
+ return r.bottom() + 1;
+#endif
}