fix bug 2036:

	* src/mathed/math_amsarrayinset.C
	(metrics): use ArrayChanger to change the style
	(draw): ditto

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

diff --git a/src/mathed/math_amsarrayinset.C b/src/mathed/math_amsarrayinset.C
index 96b8316d012f43e8195f963ca5b153cc55135fd5..32628d0df2876513abac3176083bf73f9003b92f 100644 (file)
--- a/src/mathed/math_amsarrayinset.C
+++ b/src/mathed/math_amsarrayinset.C
@@ -80,10 +80,8 @@ char const * MathAMSArrayInset::name_right() const
 
 void MathAMSArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MetricsInfo m = mi;
-       if (m.base.style == LM_ST_DISPLAY)
-               m.base.style = LM_ST_TEXT;
-       MathGridInset::metrics(m, dim);
+       ArrayChanger dummy(mi.base);
+       MathGridInset::metrics(mi, dim);
        dim.wid += 14;
        dim_ = dim;
 }
@@ -91,11 +89,12 @@ void MathAMSArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void MathAMSArrayInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathGridInset::drawWithMargin(pi, x, y, 6, 8);
        int const yy = y - dim_.ascent();
+       // Drawing the deco after an ArrayChanger does not work
        mathed_draw_deco(pi, x + 1, yy, 5, dim_.height(), name_left());
        mathed_draw_deco(pi, x + dim_.width() - 8, yy, 5, dim_.height(), name_right());
-       setPosCache(pi, x, y);
+       ArrayChanger dummy(pi.base);
+       MathGridInset::drawWithMargin(pi, x, y, 6, 8);
 }