More general fix for part of 5403.

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index ff03e6214e8478cdcc604ad1b5b526218f442b5c..9b0a0d5aa10b854ad6cc57121a2edc30c89d2ee5 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -14,16 +14,19 @@
 #include "Color.h"
 #include "MetricsInfo.h"
 
+#include "insets/Inset.h"
+
 #include "mathed/MathSupport.h"
 
 #include "frontends/Painter.h"
 
-#include <boost/assert.hpp>
+#include "support/docstring.h"
 
+#include "support/lassert.h"
 
-namespace lyx {
+using namespace std;
 
-using std::string;
+namespace lyx {
 
 
 MetricsBase::MetricsBase()
@@ -38,17 +41,12 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w)
 {}
 
 
-
-MetricsInfo::MetricsInfo()
-{}
-
-
-MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth)
-       : base(bv, font, textwidth)
+MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, 
+       MacroContext const & mc)
+       : base(bv, font, textwidth), macrocontext(mc)
 {}
 
 
-
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
        : pain(painter), ltr_pos(false), erased_(false), full_repaint(true),
        background_color(Color_background)
@@ -69,6 +67,29 @@ void PainterInfo::draw(int x, int y, docstring const & str)
 }
 
 
+ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
+{
+       ColorCode const color_bg = inset->backgroundColor();
+
+       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;
+               }
+       }
+}
+
+
 Styles smallerScriptStyle(Styles st)
 {
        switch (st) {
@@ -114,7 +135,6 @@ ArrayChanger::ArrayChanger(MetricsBase & mb)
 {}
 
 
-
 ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape)
        : Changer<FontInfo, FontShape>(font)
 {