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 49fe9f2079bfd4d3c1ca2c628a5e99f83685e8b2..f32d13363638fdf2e1defdfc9ef7cc039bccd217 100644 (file)
--- 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 9853d8f43205795bded23b1eda716123650d036b..8d6f0000d22e34f62c4d9d622c976721c0a5290f 100644 (file)
--- 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();
 }