* ANNOUNCE

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 6d701c75ac1354c15cb0eafaac86d5aced3d1f00..e68c18d79d65f4c2c619468032dc7a7e7a5dc78f 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -107,6 +107,16 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 }
 
 
+Color PainterInfo::textColor(Color const & color) const
+{
+       if (change_.changed()) 
+               return change_.color();
+       if (selected)
+               return Color_selectiontext;
+       return color;
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 //
 // ScriptChanger
@@ -302,13 +312,13 @@ WidthChanger::~WidthChanger()
 //
 /////////////////////////////////////////////////////////////////////////
 
-ColorChanger::ColorChanger(FontInfo & font, docstring const & color,
+ColorChanger::ColorChanger(FontInfo & font, ColorCode color,
                           bool really_change_color)
        : Changer<FontInfo, ColorCode>(font), change_(really_change_color)
 {
        if (change_) {
                save_ = font.color();
-               font.setColor(lcolor.getFromLyXName(to_utf8(color)));
+               font.setColor(color);
        }
 }