macro rework

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

diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C
index 5093baa81423dc4018036dc3b7c87292df8a51ac..8dd90e0e3e39e761db5e7d4e6343fd0f01fe99e2 100644 (file)
--- a/src/mathed/math_undersetinset.C
+++ b/src/mathed/math_undersetinset.C
@@ -1,30 +1,41 @@
+/**
+ * \file math_undersetinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
 
 #include "math_undersetinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_support.h"
-
+#include "cursor.h"
 
 using std::max;
+using std::auto_ptr;
 
 
-MathUndersetInset::MathUndersetInset()
-{}
 
-
-MathInset * MathUndersetInset::clone() const
+auto_ptr<InsetBase> MathUndersetInset::clone() const
 {
-       return new MathUndersetInset(*this);
+       return auto_ptr<InsetBase>(new MathUndersetInset(*this));
 }
 
 
-void MathUndersetInset::metrics(MetricsInfo & mi) const
+void MathUndersetInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(1).metrics(mi);
        FracChanger dummy(mi.base);
        cell(0).metrics(mi);
-       dim_.w = max(cell(0).width(), cell(1).width()) + 4;
-       dim_.a = cell(1).ascent();
-       dim_.d = cell(1).descent() + cell(0).height() + 4;
+       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;
 }
 
 
@@ -35,6 +46,34 @@ void MathUndersetInset::draw(PainterInfo & pi, int x, int y) const
        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(LCursor & cur) const
+{
+       cur.idx() = 1;
+       cur.pos() = 0;
+       return true;
+}
+
+
+bool MathUndersetInset::idxLast(LCursor & cur) const
+{
+       cur.idx() = 1;
+       cur.pos() = cur.lastpos();
+       return true;
+}
+
+
+bool MathUndersetInset::idxUpDown(LCursor & cur, bool up) const
+{
+       idx_type target = up; // up ? 1 : 0, since upper cell has idx 1
+       if (cur.idx() == target)
+               return false;
+       cur.idx() = target;
+       cur.pos() = cur.cell().x2pos(cur.x_target());
+       return true;
 }