X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathRow.cpp;h=81b6ad9e9218cc406dfbae1521a4389f7b205951;hb=ffff88e7fcd46afaa3b1823e9fcdc4aad4e2114b;hp=783e85ab54ab2b6452adcd0bf907f45a4370e1de;hpb=1538a8352ca82914bc131f2bf98b0ef4f55c1e2d;p=features.git

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index 783e85ab54..81b6ad9e92 100644
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -12,15 +12,16 @@
 
 #include "MathRow.h"
 
-#include "InsetMath.h"
-#include "MathClass.h"
 #include "MathData.h"
 #include "MathSupport.h"
 
 #include "BufferView.h"
+#include "ColorSet.h"
 #include "CoordCache.h"
 #include "MetricsInfo.h"
 
+#include "mathed/InsetMath.h"
+
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
@@ -38,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(marker_type::NO_MARKER), inset(nullptr), compl_unique_to(0), ar(nullptr),
 	  color(Color_red)
 {}
 
@@ -49,8 +50,16 @@ namespace {
 
 int markerMargin(MathRow::Element const & e)
 {
-	return e.marker == InsetMath::MARKER
-		|| e.marker == InsetMath::MARKER2;
+	switch(e.marker) {
+	case marker_type::MARKER:
+	case marker_type::MARKER2:
+	case marker_type::BOX_MARKER:
+		return 2;
+	case marker_type::NO_MARKER:
+		return 0;
+	}
+	// should not happen
+	return 0;
 }
 
 
@@ -59,24 +68,25 @@ void afterMetricsMarkers(MetricsInfo const & , MathRow::Element & e,
 {
 	// handle vertical space for markers
 	switch(e.marker) {
-	case InsetMath::NO_MARKER:
+	case marker_type::NO_MARKER:
 		break;
-	case InsetMath::MARKER:
+	case marker_type::MARKER:
 		++dim.des;
 		break;
-	case InsetMath::MARKER2:
+	case marker_type::MARKER2:
 		++dim.asc;
 		++dim.des;
 		break;
-	case InsetMath::BOX_MARKER:
+	case marker_type::BOX_MARKER:
 		FontInfo font;
-		font.setSize(FONT_SIZE_TINY);
+		font.setSize(TINY_SIZE);
 		Dimension namedim;
 		mathed_string_dim(font, e.inset->name(), namedim);
 		int const namewid = 1 + namedim.wid + 1;
 
 		if (namewid > dim.wid)
 			e.after += namewid - dim.wid;
+		++dim.asc;
 		dim.des += 3 + namedim.height();
 	}
 }
@@ -85,51 +95,56 @@ void afterMetricsMarkers(MetricsInfo const & , MathRow::Element & e,
 void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
                  int const x, int const y)
 {
-	if (e.marker == InsetMath::NO_MARKER)
+	if (e.marker == marker_type::NO_MARKER)
 		return;
 
 	CoordCache const & coords = pi.base.bv->coordCache();
 	Dimension const dim = coords.getInsets().dim(e.inset);
 
 	// the marker is before/after the inset. Necessary space has been reserved already.
-	int const l = x + e.before - markerMargin(e);
+	int const l = x + e.before - (markerMargin(e) > 0 ? 1 : 0);
 	int const r = x + dim.width() - e.after;
 
-	if (e.marker == InsetMath::BOX_MARKER) {
+	// Grey lower box
+	if (e.marker == marker_type::BOX_MARKER) {
 		// draw header and rectangle around
 		FontInfo font;
-		font.setSize(FONT_SIZE_TINY);
+		font.setSize(TINY_SIZE);
 		font.setColor(Color_mathmacrolabel);
 		Dimension namedim;
 		mathed_string_dim(font, e.inset->name(), namedim);
 		pi.pain.fillRectangle(l, y + dim.des - namedim.height() - 2,
 		                      dim.wid, namedim.height() + 2, Color_mathmacrobg);
 		pi.pain.text(l, y + dim.des - namedim.des - 1, e.inset->name(), font);
-		return;
 	}
 
-	// Now markers with corners
+	// Color for corners
 	bool const highlight = e.inset->mouseHovered(pi.base.bv)
 	                       || 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.getX11HexName(Color_mathbg) == lcolor.getX11HexName(pen_color))
+		return;
 
+	// Lower corners in all cases
 	int const d = y + dim.descent();
 	pi.pain.line(l, d - 3, l, d, pen_color);
 	pi.pain.line(r, d - 3, r, d, pen_color);
 	pi.pain.line(l, d, l + 3, d, pen_color);
 	pi.pain.line(r - 3, d, r, d, pen_color);
 
-	if (e.marker == InsetMath::MARKER)
-		return;
-
-	int const a = y - dim.ascent();
-	pi.pain.line(l, a + 3, l, a, pen_color);
-	pi.pain.line(r, a + 3, r, a, pen_color);
-	pi.pain.line(l, a, l + 3, a, pen_color);
-	pi.pain.line(r - 3, a, r, a, pen_color);
+	// Upper corners
+	if (e.marker == marker_type::BOX_MARKER
+	    || e.marker == marker_type::MARKER2) {
+		int const a = y - dim.ascent();
+		pi.pain.line(l, a + 3, l, a, pen_color);
+		pi.pain.line(r, a + 3, r, a, pen_color);
+		pi.pain.line(l, a, l + 3, a, pen_color);
+		pi.pain.line(r - 3, a, r, a, pen_color);
+	}
 }
 
-}
+} // namespace
 
 
 MathRow::MathRow(MetricsInfo & mi, MathData const * ar)
@@ -185,7 +200,7 @@ MathRow::MathRow(MetricsInfo & mi, MathData const * ar)
 		// for linearized insets (macros...) too
 		if (e.type == BEGIN)
 			bef.after = max(bef.after, markerMargin(e));
-		if (e.type == END && e.marker != InsetMath::NO_MARKER) {
+		if (e.type == END && e.marker != marker_type::NO_MARKER) {
 			Element & aft = elements_[after(i)];
 			aft.before = max(aft.before, markerMargin(e));
 		}
@@ -221,7 +236,6 @@ int MathRow::after(int i) const
 
 void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
 {
-	dim.asc = 0;
 	dim.wid = 0;
 	// In order to compute the dimension of macros and their
 	// arguments, it is necessary to keep track of them.
@@ -308,15 +322,16 @@ void MathRow::draw(PainterInfo & pi, int x, int const y) const
 			// This is hackish: the math inset does not know that space
 			// has been added before and after it; we alter its dimension
 			// while it is drawing, because it relies on this value.
-			Dimension const d = coords.insets().dim(e.inset);
-			Dimension d2 = d;
-			d2.wid -= e.before + e.after;
-			coords.insets().add(e.inset, d2);
+			Geometry & g = coords.insets().geometry(e.inset);
+			g.dim.wid -= e.before + e.after;
+			if (pi.pain.develMode() && !e.inset->isBufferValid())
+				pi.pain.fillRectangle(x + e.before, y - g.dim.ascent(),
+				                      g.dim.width(), g.dim.height(), Color_error);
 			e.inset->draw(pi, x + e.before, y);
-			coords.insets().add(e.inset, x, y);
-			coords.insets().add(e.inset, d);
+			g.pos = {x, y};
+			g.dim.wid += e.before + e.after;
 			drawMarkers(pi, e, x, y);
-			x += d.wid;
+			x += g.dim.wid;
 			break;
 		}
 		case BEGIN:
@@ -362,12 +377,14 @@ void MathRow::draw(PainterInfo & pi, int x, int const y) const
 
 		if (!s1.empty()) {
 			f.setColor(Color_inlinecompletion);
-			pi.pain.text(x, y, s1, f);
+			// offset the text by e.after to make sure that the
+			// spacing is after the completion, not before.
+			pi.pain.text(x - e.after, y, s1, f);
 			x += mathed_string_width(f, s1);
 		}
 		if (!s2.empty()) {
 			f.setColor(Color_nonunique_inlinecompletion);
-			pi.pain.text(x, y, s2, f);
+			pi.pain.text(x - e.after, y, s2, f);
 			x += mathed_string_width(f, s2);
 		}
 	}