X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_undersetinset.C;h=8dd90e0e3e39e761db5e7d4e6343fd0f01fe99e2;hb=b447408de232872fef1537fca542abc23702d572;hp=f04e2dfeec8c23bdb9359e890330bcff0cce5ea4;hpb=38fce2feaced45d99f3e78ee8e877f2c37aa6bd1;p=lyx.git

diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C
index f04e2dfeec..8dd90e0e3e 100644
--- a/src/mathed/math_undersetinset.C
+++ b/src/mathed/math_undersetinset.C
@@ -1,41 +1,79 @@
+/**
+ * \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));
 }
 
 
-Dimension 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_.wid = max(cell(0).width(), cell(1).width()) + 4;
-	dim_.asc = cell(1).ascent();
-	dim_.des = cell(1).descent() + cell(0).height() + 4;
-	return 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(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;
 }