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

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

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 577d49e3bb5714ba9e5e969fcc0c0cfe20b85fb0..7fd57abee36492cd206e283cb4fc225bc2adab79 100644 (file)
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -14,51 +14,49 @@
 #include "MathData.h"
 #include "MathStream.h"
 
-#include "cursor.h"
+#include "Cursor.h"
 #include "LaTeXFeatures.h"
 
 
 namespace lyx {
 
-using std::max;
-using std::auto_ptr;
-
-
-
-auto_ptr<InsetBase> InsetMathUnderset::doClone() const
+Inset * InsetMathUnderset::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathUnderset(*this));
+       return new InsetMathUnderset(*this);
 }
 
 
-bool InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(1).metrics(mi);
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
        FracChanger dummy(mi.base);
-       cell(0).metrics(mi);
-       dim.wid = max(cell(0).width(), cell(1).width()) + 4;
-       dim.asc = cell(1).ascent();
-       dim.des = cell(1).descent() + cell(0).height() + 4;
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
+       dim.wid = std::max(dim0.width(), dim1.width()) + 4;
+       dim.asc = dim1.ascent();
+       dim.des = dim1.descent() + dim0.height() + 4;
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
+       // Cache the inset dimension. 
+       setDimCache(mi, dim);
 }
 
 
 void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + width() / 2;
-       int yo = y + cell(1).descent() + cell(0).ascent() + 1;
-       cell(1).draw(pi, m - cell(1).width() / 2, y);
+       Dimension const dim = dimension(*pi.base.bv);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
+       Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+       int m  = x + dim.wid / 2;
+       int yo = y + dim1.descent() + dim0.ascent() + 1;
+       cell(1).draw(pi, m - dim1.width() / 2, y);
        FracChanger dummy(pi.base);
-       cell(0).draw(pi, m - cell(0).width() / 2, yo);
+       cell(0).draw(pi, m - dim0.width() / 2, yo);
        drawMarkers(pi, x, y);
 }
 
 
-bool InsetMathUnderset::idxFirst(LCursor & cur) const
+bool InsetMathUnderset::idxFirst(Cursor & cur) const
 {
        cur.idx() = 1;
        cur.pos() = 0;
@@ -66,7 +64,7 @@ bool InsetMathUnderset::idxFirst(LCursor & cur) const
 }
 
 
-bool InsetMathUnderset::idxLast(LCursor & cur) const
+bool InsetMathUnderset::idxLast(Cursor & cur) const
 {
        cur.idx() = 1;
        cur.pos() = cur.lastpos();
@@ -74,7 +72,7 @@ bool InsetMathUnderset::idxLast(LCursor & cur) const
 }
 
 
-bool InsetMathUnderset::idxUpDown(LCursor & cur, bool up) const
+bool InsetMathUnderset::idxUpDown(Cursor & cur, bool up) const
 {
        idx_type target = up; // up ? 1 : 0, since upper cell has idx 1
        if (cur.idx() == target)