fix frac drawing in displaystyle

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

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index e7b46738dce2a9bf3bb744997bae5cef0b209213..51dc9586fda9a5292c8824618d3620f9402aab73 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -154,7 +154,6 @@ void InsetFormulaBase::metrics(BufferView * bv) const
        if (bv)
                view_ = bv->owner()->view();
        MathMetricsInfo mi;
-       //mi.base.style = display() ? LM_ST_DISPLAY : LM_ST_TEXT;
        mi.base.style = LM_ST_TEXT;
        mi.base.font  = font_;
        mi.base.font.setColor(LColor::math);

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 1bff0d5fcc941400d5186f4e2639b9b1fa1d03be..0114359321150206046b0d88594b911f201eb801 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -158,7 +158,8 @@ char const * MathHullInset::standardFont() const
 
 void MathHullInset::metrics(MathMetricsInfo & mi) const
 {
-       MathFontSetChanger dummy(mi.base, standardFont());
+       MathFontSetChanger dummy1(mi.base, standardFont());
+       MathStyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
 
        // let the cells adjust themselves
        MathGridInset::metrics(mi);
@@ -192,7 +193,8 @@ void MathHullInset::metrics(MathMetricsInfo & mi) const
 
 void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy(pi.base, standardFont());
+       MathFontSetChanger dummy1(pi.base, standardFont());
+       MathStyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
        MathGridInset::draw(pi, x + 1, y);
 
        if (numberedType()) {