X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=537efd351b875b086b091914f32b7c2ae19ae1e7;hb=27ba830b8ef513c8332e15747797844a97807791;hp=93782f94765882948b245d7959d7965796b44d00;hpb=d77b05db80497cb0b5ce6ca1497165d968c234be;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 93782f9476..537efd351b 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -74,7 +74,11 @@ Changer MetricsBase::changeFontSet(string const & name)
 	    && ((isTextFont(oldname) && oldcolor != Color_foreground)
 	        || (isMathFont(oldname) && oldcolor != Color_math)))
 		font.setColor(oldcolor);
+#if __cplusplus >= 201402L
+	return rc;
+#else
 	return move(rc);
+#endif
 }
 
 
@@ -103,7 +107,7 @@ int MetricsBase::inPixels(Length const & len) const
 		fi.setFamily(SYMBOL_FAMILY);
 	else
 		// Math style is only taken into account in the case of mu
-		fi.setStyle(LM_ST_TEXT);
+		fi.setStyle(TEXT_STYLE);
 	return len.inPixels(textwidth, theFontMetrics(fi).em());
 }
 
@@ -127,8 +131,9 @@ MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
 /////////////////////////////////////////////////////////////////////////
 
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
-	: pain(painter), ltr_pos(false), change_(), selected(false),
-	do_spellcheck(true), full_repaint(true), background_color(Color_background)
+	: pain(painter), ltr_pos(false), change(), selected(false),
+	  do_spellcheck(true), full_repaint(true), background_color(Color_background),
+	  leftx(0), rightx(0)
 {
 	base.bv = bv;
 }
@@ -153,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;
@@ -182,12 +189,15 @@ Color PainterInfo::textColor(Color const & color) const
 Changer MetricsBase::changeScript()
 {
 	switch (font.style()) {
-	case LM_ST_DISPLAY:
-	case LM_ST_TEXT:
-		return font.changeStyle(LM_ST_SCRIPT);
-	case LM_ST_SCRIPT:
-	case LM_ST_SCRIPTSCRIPT:
-		return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+	case DISPLAY_STYLE:
+	case TEXT_STYLE:
+		return font.changeStyle(SCRIPT_STYLE);
+	case SCRIPT_STYLE:
+	case SCRIPTSCRIPT_STYLE:
+		return font.changeStyle(SCRIPTSCRIPT_STYLE);
+	case INHERIT_STYLE:
+	case IGNORE_STYLE:
+		return Changer();
 	}
 	//remove Warning
 	return Changer();
@@ -197,22 +207,27 @@ Changer MetricsBase::changeScript()
 Changer MetricsBase::changeFrac()
 {
 	switch (font.style()) {
-	case LM_ST_DISPLAY:
-		return font.changeStyle(LM_ST_TEXT);
-	case LM_ST_TEXT:
-		return font.changeStyle(LM_ST_SCRIPT);
-	case LM_ST_SCRIPT:
-	case LM_ST_SCRIPTSCRIPT:
-		return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+	case DISPLAY_STYLE:
+		return font.changeStyle(TEXT_STYLE);
+	case TEXT_STYLE:
+		return font.changeStyle(SCRIPT_STYLE);
+	case SCRIPT_STYLE:
+	case SCRIPTSCRIPT_STYLE:
+		return font.changeStyle(SCRIPTSCRIPT_STYLE);
+	case INHERIT_STYLE:
+	case IGNORE_STYLE:
+		return Changer();
 	}
 	//remove Warning
 	return Changer();
 }
 
 
-Changer MetricsBase::changeArray()
+Changer MetricsBase::changeArray(bool small)
 {
-	return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT)
+	if (small)
+		return font.changeStyle(SCRIPT_STYLE);
+	return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
 		: Changer();
 }