Move <algorithm> from DocIterator.h

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

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index 7c5b9456ac2097d34e8496cf87ee9d4174a15ebb..be61c8a39c21131f169e182a529e8fd7d9f46331 100644 (file)
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -39,7 +39,7 @@ namespace lyx {
 
 MathRow::Element::Element(MetricsInfo const & mi, Type t, MathClass mc)
        : type(t), mclass(mc), before(0), after(0), macro_nesting(mi.base.macro_nesting),
-         marker(InsetMath::NO_MARKER), inset(0), compl_unique_to(0), ar(0),
+         marker(InsetMath::NO_MARKER), inset(nullptr), compl_unique_to(0), ar(nullptr),
          color(Color_red)
 {}
 
@@ -123,7 +123,7 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
                               || e.inset->editing(pi.base.bv);
        ColorCode const pen_color = highlight ? Color_mathframe : Color_mathcorners;
        // If the corners have the same color as the background, do not paint them.
-       if (lcolor.getX11Name(Color_mathbg) == lcolor.getX11Name(pen_color))
+       if (lcolor.getX11HexName(Color_mathbg) == lcolor.getX11HexName(pen_color))
                return;
 
        // Lower corners in all cases
@@ -326,6 +326,9 @@ void MathRow::draw(PainterInfo & pi, int x, int const y) const
                        Dimension d2 = d;
                        d2.wid -= e.before + e.after;
                        coords.insets().add(e.inset, d2);
+                       if (pi.pain.develMode() && !e.inset->isBufferValid())
+                               pi.pain.fillRectangle(x + e.before, y - d2.ascent(),
+                                                     d2.width(), d2.height(), Color_error);
                        e.inset->draw(pi, x + e.before, y);
                        coords.insets().add(e.inset, x, y);
                        coords.insets().add(e.inset, d);