X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=537efd351b875b086b091914f32b7c2ae19ae1e7;hb=861c6167ca5f1329e16dd788489a7c03772e2332;hp=3ec1529ba642827e69424243f59014367c70d67a;hpb=dea245d5409fb47af7efb5248f1b43e15d6563d3;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 3ec1529ba6..537efd351b 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -131,7 +131,7 @@ MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
 /////////////////////////////////////////////////////////////////////////
 
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
-	: pain(painter), ltr_pos(false), change_(), selected(false),
+	: pain(painter), ltr_pos(false), change(), selected(false),
 	  do_spellcheck(true), full_repaint(true), background_color(Color_background),
 	  leftx(0), rightx(0)
 {
@@ -158,26 +158,28 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 	if (selected && sel)
 		// This inset is in a selection
 		return Color_selection;
-	else {
-		if (color_bg != Color_none)
-			// This inset has its own color
-			return color_bg;
-		else {
-			if (background_color == Color_none)
-				// This inset has no own color and does not inherit a color
-				return Color_background;
-			else
-				// This inset has no own color, but inherits a color
-				return background_color;
-		}
-	}
+
+	if (pain.develMode() && !inset->isBufferValid())
+		// This inset is in error
+		return Color_error;
+
+	if (color_bg != Color_none)
+		// This inset has its own color
+		return color_bg;
+
+	if (background_color == Color_none)
+		// This inset has no own color and does not inherit a color
+		return Color_background;
+
+	// This inset has no own color, but inherits a color
+	return background_color;
 }
 
 
 Color PainterInfo::textColor(Color const & color) const
 {
-	if (change_.changed())
-		return change_.color();
+	if (change.changed())
+		return change.color();
 	if (selected)
 		return Color_selectiontext;
 	return color;
@@ -221,8 +223,10 @@ Changer MetricsBase::changeFrac()
 }
 
 
-Changer MetricsBase::changeArray()
+Changer MetricsBase::changeArray(bool small)
 {
+	if (small)
+		return font.changeStyle(SCRIPT_STYLE);
 	return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
 		: Changer();
 }