Update my email and status.

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 6297c7b4a0e2f193d6a35ff5ced339b9b5fd0cf8..020b25f87428baa84e912aa915c518beb082177f 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -103,6 +103,11 @@ public:
        /// \param sel whether to take the selection state into account
        ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
 
+       /// Determines the text color based on the intended color, the
+       /// change tracking state and the selection state. 
+       /// \param color what the color should be by default
+       Color textColor(Color const & color) const;
+
        ///
        MetricsBase base;
        ///
@@ -222,12 +227,16 @@ public:
 
 
 // temporarily change the used color
-class ColorChanger : public Changer<FontInfo, std::string> {
+class ColorChanger : public Changer<FontInfo, ColorCode> {
 public:
        ///
-       ColorChanger(FontInfo & font, std::string const & color);
+       ColorChanger(FontInfo & font, ColorCode color,
+                    bool really_change_color = true);
        ///
        ~ColorChanger();
+private:
+       ///
+       bool change_;
 };
 
 } // namespace lyx