Aesthetic improvement of equation positioning when previewing in display mode.

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 3561ef3dc4093e5df09c6911d435a93e5ba9a888..3da70dd6730ff027ca6ba40d327c6842fae633d5 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-23  Angus Leeming  <leeming@lyx.org>
+
+       * formula.C (descent): add an arbitrary 12 pixels to the descent when
+       previewing a display mode equation, analogous to André's code elsewhere.
+
 2002-07-22  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * math_support.C (mathed_draw_deco): fix rounding bug for rotated

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index cb48996910288f2ea1085517cc0c2916bfef88de..d2c32a2e49344e9c73787e8e35b053d15f014a09 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -448,8 +448,11 @@ int InsetFormula::ascent(BufferView *, LyXFont const &) const
 
 int InsetFormula::descent(BufferView *, LyXFont const &) const
 {
-       return preview_->usePreview() ?
-               preview_->pimage_->descent() : 1 + par_->descent();
+       if (!preview_->usePreview())
+               return 1 + par_->descent();
+
+       int const descent = preview_->pimage_->descent();
+       return display() ? descent + 12 : descent;
 }