prevent crash when inserting minipage in table cell,

[lyx.git] / src / insets / insetcollapsable.C

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 2a328f3c463a95ce1bfd4b4c7ac77bc8287ea9e7..4a5002bf199fc9e1f96f1c568393b1ae618b161a 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -113,7 +113,6 @@ void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
 void InsetCollapsable::dimension_collapsed(Dimension & dim) const
 {
        font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
-       dim.wid += 2 * TEXT_TO_INSET_OFFSET;
 }
 
 
@@ -141,7 +140,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
 {
-       pi.pain.buttonText(x + TEXT_TO_INSET_OFFSET, y, label, labelfont);
+       pi.pain.buttonText(x, y, label, labelfont);
 }
 
 
@@ -181,8 +180,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y, bool inlined) const
                inset.draw(pi, x, y);
        } else {
                draw_collapsed(pi, old_x, bl);
-               int const yy = bl + dim_collapsed.descent() + inset.ascent();
-               inset.draw(pi, x, yy);
+               inset.draw(pi, x, bl + dim_collapsed.descent() + inset.ascent());
        }
 }