macro rework

[lyx.git] / src / mathed / math_undersetinset.C

diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C
index bf73084e030f9759c09ea4774e5922bf907cd9e3..8dd90e0e3e39e761db5e7d4e6343fd0f01fe99e2 100644 (file)
--- a/src/mathed/math_undersetinset.C
+++ b/src/mathed/math_undersetinset.C
@@ -11,13 +11,15 @@
 #include <config.h>
 
 #include "math_undersetinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-
+#include "cursor.h"
 
 using std::max;
 using std::auto_ptr;
 
 
+
 auto_ptr<InsetBase> MathUndersetInset::clone() const
 {
        return auto_ptr<InsetBase>(new MathUndersetInset(*this));
@@ -29,47 +31,48 @@ void MathUndersetInset::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(1).metrics(mi);
        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;
-       dim = dim_;
+       dim.wid = max(cell(0).width(), cell(1).width()) + 4;
+       dim.asc = cell(1).ascent();
+       dim.des = cell(1).descent() + cell(0).height() + 4;
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
 void MathUndersetInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + pi.width / 2;
+       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);
        FracChanger dummy(pi.base);
        cell(0).draw(pi, m - cell(0).width() / 2, yo);
+       drawMarkers(pi, x, y);
 }
 
 
-bool MathUndersetInset::idxFirst(idx_type & i, pos_type & pos) const
+bool MathUndersetInset::idxFirst(LCursor & cur) const
 {
-       i = 1;
-       pos = 0;
+       cur.idx() = 1;
+       cur.pos() = 0;
        return true;
 }
 
 
-bool MathUndersetInset::idxLast(idx_type & i, pos_type & pos) const
+bool MathUndersetInset::idxLast(LCursor & cur) const
 {
-       i = 1;
-       pos = cell(i).size();
+       cur.idx() = 1;
+       cur.pos() = cur.lastpos();
        return true;
 }
 
 
-bool MathUndersetInset::idxUpDown(idx_type & idx, pos_type & pos, bool up,
-       int targetx) const
+bool MathUndersetInset::idxUpDown(LCursor & cur, bool up) const
 {
        idx_type target = up; // up ? 1 : 0, since upper cell has idx 1
-       if (idx == target)
+       if (cur.idx() == target)
                return false;
-       idx = target;
-       pos = cell(idx).x2pos(targetx);
+       cur.idx() = target;
+       cur.pos() = cur.cell().x2pos(cur.x_target());
        return true;
 }