X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathCancel.cpp;h=25728a3680ac40e64a765b1e1d05ac1823779d2b;hb=a59301eaff51c63db706e17bd5496b8e02928f14;hp=dcda5b63ea67d4739adf468a1ed3efdff542e2f7;hpb=348e0241af2dd8e5e1dda30e28d89c3a7f1fc03b;p=lyx.git

diff --git a/src/mathed/InsetMathCancel.cpp b/src/mathed/InsetMathCancel.cpp
index dcda5b63ea..25728a3680 100644
--- a/src/mathed/InsetMathCancel.cpp
+++ b/src/mathed/InsetMathCancel.cpp
@@ -37,17 +37,19 @@ Inset * InsetMathCancel::clone() const
 
 void InsetMathCancel::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	Changer dummy = mi.base.changeEnsureMath();
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
 }
 
 
 void InsetMathCancel::draw(PainterInfo & pi, int x, int y) const
 {
+	Changer dummy = pi.base.changeEnsureMath();
 	// We first draw the text and then an arrow
 	ColorCode const origcol = pi.base.font.color();
-	cell(0).draw(pi, x + 1, y);
+	cell(0).draw(pi, x, y);
 	Dimension const dim = dimension(*pi.base.bv);
+	int const t = pi.base.solidLineThickness();
 
 	/*
 	 * y1 \    /
@@ -65,15 +67,13 @@ void InsetMathCancel::draw(PainterInfo & pi, int x, int y) const
 	int const y2 = y + dim.des;
 
 	if (kind_ == cancel)
-		pi.pain.line(x2, y1, x1, y2, origcol);
+		pi.pain.line(x2, y1, x1, y2, origcol, pi.pain.line_solid, t);
 	else if (kind_ == bcancel)
-		pi.pain.line(x2, y2, x1, y1, origcol);
+		pi.pain.line(x2, y2, x1, y1, origcol, pi.pain.line_solid, t);
 	else if (kind_ == xcancel) {
-		pi.pain.line(x2, y1, x1, y2, origcol);
-		pi.pain.line(x2, y2, x1, y1, origcol);
+		pi.pain.line(x2, y1, x1, y2, origcol, pi.pain.line_solid, t);
+		pi.pain.line(x2, y2, x1, y1, origcol, pi.pain.line_solid, t);
 	}
-
-	drawMarkers(pi, x, y);
 }
 
 
@@ -144,12 +144,12 @@ void InsetMathCancel::mathmlize(MathStream & os) const
 	case cancel:
 		os << MTag("menclose", "notation='updiagonalstrike'")
 		   << cell(0)
-		   << ETag("menclose"); 
+		   << ETag("menclose");
 		break;
 	case bcancel:
 		os << MTag("menclose", "notation='downdiagonalstrike'")
 		   << cell(0)
-		   << ETag("menclose"); 
+		   << ETag("menclose");
 		break;
 	case xcancel:
 		os << MTag("menclose", "notation='updiagonalstrike'")