From e8ec07a066182276b4a03535777737982d619176 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Tue, 11 Apr 2006 13:57:05 +0000 Subject: [PATCH] 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 --- src/mathed/math_amsarrayinset.C | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mathed/math_amsarrayinset.C b/src/mathed/math_amsarrayinset.C index 96b8316d01..32628d0df2 100644 --- 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); }