Fixup ad79ac40: reintroduce markers around delimiters

[lyx.git] / src / mathed / InsetMathCancel.cpp

diff --git a/src/mathed/InsetMathCancel.cpp b/src/mathed/InsetMathCancel.cpp
index 0e91575d8df2d3f58f38a8d1e82a0a38f8d5488b..25728a3680ac40e64a765b1e1d05ac1823779d2b 100644 (file)
--- a/src/mathed/InsetMathCancel.cpp
+++ b/src/mathed/InsetMathCancel.cpp
@@ -39,7 +39,6 @@ void InsetMathCancel::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        Changer dummy = mi.base.changeEnsureMath();
        cell(0).metrics(mi, dim);
-       metricsMarkers(mi, dim);
 }
 
 
@@ -48,8 +47,9 @@ 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 \    /
@@ -67,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);
 }
 
 
@@ -146,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'")