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

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

diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index 3df8d284bf0a54b87914c5aa4f3be3d67b1c9b29..2879659e1ecb25a5aa6ec556308b7bb771ff1106 100644 (file)
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@@ -11,50 +11,47 @@
 #include <config.h>
 
 #include "InsetMathStackrel.h"
-#include "MathArray.h"
+#include "MathData.h"
 #include "MathStream.h"
 
+using namespace std;
 
 namespace lyx {
 
-
-using std::max;
-using std::auto_ptr;
-
-
 InsetMathStackrel::InsetMathStackrel()
 {}
 
 
-auto_ptr<InsetBase> InsetMathStackrel::doClone() const
+Inset * InsetMathStackrel::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathStackrel(*this));
+       return new InsetMathStackrel(*this);
 }
 
 
-bool InsetMathStackrel::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathStackrel::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.width()) + 4;
+       dim.asc = dim1.ascent() + dim0.height() + 4;
+       dim.des = dim1.descent();
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
 void InsetMathStackrel::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + dim_.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.width() / 2;
+       int yo = y - dim1.ascent() - dim0.descent() - 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);
 }