* GuiDocument.cpp (less_textclass_avail_desc):

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index a90a62bc176d7fa3c5662f8412bb646ed35286b9..ecddcab8bb824cb80cc6f2351be4f9c870b19d73 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -14,6 +14,8 @@
 #include "Color.h"
 #include "MetricsInfo.h"
 
+#include "insets/Inset.h"
+
 #include "mathed/MathSupport.h"
 
 #include "frontends/Painter.h"
@@ -46,8 +48,8 @@ MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth,
 
 
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
-       : pain(painter), ltr_pos(false), erased_(false), full_repaint(true),
-       background_color(Color_background)
+       : pain(painter), ltr_pos(false), erased_(false), selected(false),
+       full_repaint(true), background_color(Color_background)
 {
        base.bv = bv;
 }
@@ -65,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) {