From: Dekel Tsur <dekelts@tau.ac.il>
Date: Mon, 21 Oct 2002 15:51:06 +0000 (+0000)
Subject: Fix ascent()
X-Git-Tag: 1.6.10~18132
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5696dc328793eedd99ad31f5e72928fb7dc5c80d;p=features.git

Fix ascent()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5461 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f67aeba143..1273f3ebd3 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-21  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* qfont_metrics.C (ascent): Fix returned value.
+
 2002-10-21  Philippe Elie  <phil.el@wanadoo.fr>
 
 	* QContentPane.h:
diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C
index 30f4dd3234..3019577e82 100644
--- a/src/frontends/qt2/qfont_metrics.C
+++ b/src/frontends/qt2/qfont_metrics.C
@@ -46,28 +46,28 @@ int maxAscent(LyXFont const & f)
 
 int maxDescent(LyXFont const & f)
 {
-	return metrics(f).descent();
+	return metrics(f).descent()+1;
+	// We add 1 as the value returned by QT is different than X
+	// See http://doc.trolltech.com/2.3/qfontmetrics.html#200b74
 }
 
 
 int ascent(char c, LyXFont const & f)
 {
 	QRect r = metrics(f).boundingRect(c);
-	return abs(r.top());
+	return -r.top();
 }
 
 
 int descent(char c, LyXFont const & f)
 {
 	QRect r = metrics(f).boundingRect(c);
-	return abs(r.bottom());
+	return r.bottom()+1;
 }
 
 
 int lbearing(char c, LyXFont const & f)
 {
-	lyxerr << "lb of " << c << " is " << metrics(f).leftBearing(c)
-	       << std::endl;
 	return metrics(f).leftBearing(c);
 }