mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-14 12:25:11 +00:00
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
This commit is contained in:
parent
5b448e549e
commit
e8ec07a066
@ -80,10 +80,8 @@ char const * MathAMSArrayInset::name_right() const
|
|||||||
|
|
||||||
void MathAMSArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
|
void MathAMSArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
|
||||||
{
|
{
|
||||||
MetricsInfo m = mi;
|
ArrayChanger dummy(mi.base);
|
||||||
if (m.base.style == LM_ST_DISPLAY)
|
MathGridInset::metrics(mi, dim);
|
||||||
m.base.style = LM_ST_TEXT;
|
|
||||||
MathGridInset::metrics(m, dim);
|
|
||||||
dim.wid += 14;
|
dim.wid += 14;
|
||||||
dim_ = dim;
|
dim_ = dim;
|
||||||
}
|
}
|
||||||
@ -91,11 +89,12 @@ void MathAMSArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
|
|||||||
|
|
||||||
void MathAMSArrayInset::draw(PainterInfo & pi, int x, int y) const
|
void MathAMSArrayInset::draw(PainterInfo & pi, int x, int y) const
|
||||||
{
|
{
|
||||||
MathGridInset::drawWithMargin(pi, x, y, 6, 8);
|
|
||||||
int const yy = y - dim_.ascent();
|
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 + 1, yy, 5, dim_.height(), name_left());
|
||||||
mathed_draw_deco(pi, x + dim_.width() - 8, yy, 5, dim_.height(), name_right());
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user