anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix font metrics with Qt/Win 3.2.1nc

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9455 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-01-07 15:29:45 +00:00
parent 5843057992
commit aab625bdb9
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
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:

16
src/frontends/qt2/qfont_metrics.C
View File

@ -65,7 +65,14 @@ int ascent(char c, LyXFont const & f)
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
}
@ -74,7 +81,14 @@ int descent(char c, LyXFont const & f)
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
}