last commit was incomplete... not sure how I managed this..

[lyx.git] / src / mathed / InsetMathDecoration.cpp

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 9879d558ba35a8bb8a9527a0c419c26b3405aa4b..1dc8a1471bc18784256ddea93cb333d3ad5f2efe 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -101,7 +101,7 @@ bool InsetMathDecoration::ams() const
 }
 
 
-bool InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
 
@@ -117,20 +117,19 @@ bool InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
        }
 
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
+       // Cache the inset dimension. 
+       setDimCache(mi, dim);
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
        cell(0).draw(pi, x + 1, y);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        if (wide())
-               mathed_draw_deco(pi, x + 1, y + dy_, cell(0).width(), dh_, key_->name);
+               mathed_draw_deco(pi, x + 1, y + dy_, dim0.wid, dh_, key_->name);
        else
-               mathed_draw_deco(pi, x + 1 + (cell(0).width() - dw_) / 2,
+               mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2,
                        y + dy_, dw_, dh_, key_->name);
        drawMarkers(pi, x, y);
        setPosCache(pi, x, y);