Track whether we have warned about mixing layouts across e.g. branches.

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 547d14c86072f21e5e1163ee465c5c3c42b3bead..537efd351b875b086b091914f32b7c2ae19ae1e7 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -131,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;
 }
@@ -157,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;
@@ -220,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();
 }