From: John Levon <levon@movementarian.org>
Date: Sat, 7 Sep 2002 22:25:03 +0000 (+0000)
Subject: unrevert per-char metrics
X-Git-Tag: 1.6.10~18344
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0666855b722a917ee9dff11e9447568a489b1ac1;p=features.git

unrevert per-char metrics


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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 49fe9f2079..f32d133636 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-07  John Levon  <levon@movementarian.org>
+
+	* qfont_metrics.C: unrevert per-char metrics. Droppings
+	  are better than entirely wrong metrics. Hopefully
+	  Andre can fix it ...
+ 
 2002-09-07  John Levon  <levon@movementarian.org>
 
 	* qfont_loader.C: fix sizes for symbols etc.
diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C
index 9853d8f432..8d6f0000d2 100644
--- a/src/frontends/qt2/qfont_metrics.C
+++ b/src/frontends/qt2/qfont_metrics.C
@@ -43,29 +43,17 @@ int maxDescent(LyXFont const & f)
 }
 
 
-int ascent(char /*c*/, LyXFont const & f)
+int ascent(char c, LyXFont const & f)
 {
-// LyX is broken - returning accurate metrics breaks mathed
-// because the cursor extends outside of its region.
-// http://marc.theaimsgroup.com/?l=lyx-devel&m=103060206211300&w=2 
-#if 0
 	QRect r = metrics(f).boundingRect(c);
 	return abs(r.top());
-#endif
-	return metrics(f).ascent();
 }
 
 
-int descent(char /*c*/, LyXFont const & f)
+int descent(char c, LyXFont const & f)
 {
-// LyX is broken - returning accurate metrics breaks mathed
-// because the cursor extends outside of its region.
-// http://marc.theaimsgroup.com/?l=lyx-devel&m=103060206211300&w=2 
-#if 0
 	QRect r = metrics(f).boundingRect(c);
 	return abs(r.bottom());
-#endif
-	return metrics(f).descent();
 }