X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_undersetinset.C;h=8dd90e0e3e39e761db5e7d4e6343fd0f01fe99e2;hb=edbef46cd7865dab72ab6b503d62e2492479d297;hp=4dce259f58f7cfe5dca61e01f7830efe1ab09b5d;hpb=70d0ba900118ac7e253c1e1969fd7a3d64ec8e03;p=lyx.git

diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C
index 4dce259f58..8dd90e0e3e 100644
--- a/src/mathed/math_undersetinset.C
+++ b/src/mathed/math_undersetinset.C
@@ -13,12 +13,13 @@
 #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));
@@ -30,49 +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(BufferView & bv) const
+bool MathUndersetInset::idxFirst(LCursor & cur) const
 {
-	CursorSlice & cur = cursorTip(bv);
 	cur.idx() = 1;
 	cur.pos() = 0;
 	return true;
 }
 
 
-bool MathUndersetInset::idxLast(BufferView & bv) const
+bool MathUndersetInset::idxLast(LCursor & cur) const
 {
-	CursorSlice & cur = cursorTip(bv);
 	cur.idx() = 1;
 	cur.pos() = cur.lastpos();
 	return true;
 }
 
 
-bool MathUndersetInset::idxUpDown(BufferView & bv, bool up, int targetx) const
+bool MathUndersetInset::idxUpDown(LCursor & cur, bool up) const
 {
-	CursorSlice & cur = cursorTip(bv);
 	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(targetx);
+	cur.pos() = cur.cell().x2pos(cur.x_target());
 	return true;
 }