Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index a2a6ecd2b61cfc1d9a433e3383f7ac6f949db981..62a82427cdc0f50a064bff0ffd04f99896e58813 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -11,53 +11,51 @@
 #include <config.h>
 
 #include "InsetMathOverset.h"
-#include "MathArray.h"
+#include "MathData.h"
 #include "MathStream.h"
 
-#include "cursor.h"
+#include "Cursor.h"
 #include "LaTeXFeatures.h"
 
+using namespace std;
 
 namespace lyx {
 
-using std::max;
-using std::auto_ptr;
-
-
-auto_ptr<InsetBase> InsetMathOverset::doClone() const
+Inset * InsetMathOverset::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathOverset(*this));
+       return new InsetMathOverset(*this);
 }
 
 
-bool InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathOverset::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() + cell(0).height() + 4;
-       dim.des = cell(1).descent();
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
+       dim.wid = max(dim0.width(), dim1.wid) + 4;
+       dim.asc = dim1.asc + dim0.height() + 4;
+       dim.des = dim1.des;
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
 void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + width() / 2;
-       int yo = y - cell(1).ascent() + cell(0).descent() - 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.asc - dim0.des - 1;
+       cell(1).draw(pi, m - dim1.wid / 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 InsetMathOverset::idxFirst(LCursor & cur) const
+bool InsetMathOverset::idxFirst(Cursor & cur) const
 {
        cur.idx() = 1;
        cur.pos() = 0;
@@ -65,7 +63,7 @@ bool InsetMathOverset::idxFirst(LCursor & cur) const
 }
 
 
-bool InsetMathOverset::idxLast(LCursor & cur) const
+bool InsetMathOverset::idxLast(Cursor & cur) const
 {
        cur.idx() = 1;
        cur.pos() = cur.lastpos();