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

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index b3a3b340ed..81b6ad9e92 100644
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -12,8 +12,6 @@
 
 #include "MathRow.h"
 
-#include "InsetMath.h"
-#include "MathClass.h"
 #include "MathData.h"
 #include "MathSupport.h"
 
@@ -22,6 +20,8 @@
 #include "CoordCache.h"
 #include "MetricsInfo.h"
 
+#include "mathed/InsetMath.h"
+
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
@@ -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(marker_type::NO_MARKER), inset(nullptr), compl_unique_to(0), ar(nullptr),
 	  color(Color_red)
 {}
 
@@ -51,11 +51,11 @@ namespace {
 int markerMargin(MathRow::Element const & e)
 {
 	switch(e.marker) {
-	case InsetMath::MARKER:
-	case InsetMath::MARKER2:
-	case InsetMath::BOX_MARKER:
+	case marker_type::MARKER:
+	case marker_type::MARKER2:
+	case marker_type::BOX_MARKER:
 		return 2;
-	case InsetMath::NO_MARKER:
+	case marker_type::NO_MARKER:
 		return 0;
 	}
 	// should not happen
@@ -68,18 +68,18 @@ 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;
@@ -95,7 +95,7 @@ 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();
@@ -106,10 +106,10 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
 	int const r = x + dim.width() - e.after;
 
 	// Grey lower box
-	if (e.marker == InsetMath::BOX_MARKER) {
+	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);
@@ -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
@@ -134,8 +134,8 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
 	pi.pain.line(r - 3, d, r, d, pen_color);
 
 	// Upper corners
-	if (e.marker == InsetMath::BOX_MARKER
-	    || e.marker == InsetMath::MARKER2) {
+	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);
@@ -200,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));
 		}
@@ -322,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: