Try even harder to obtain an instant preview

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 020b97ec1793be9035d224d02de1cf7e9218f3d9..88dd39fd7d7e5958b5eba94972d9aa3adf7c7c53 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -18,7 +18,6 @@
 #include "FontInfo.h"
 
 #include "support/strfwd.h"
-#include "support/types.h"
 
 #include <string>
 
@@ -103,6 +102,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;
        ///
@@ -122,14 +126,16 @@ public:
 class TextMetricsInfo {};
 
 
-/// Generic base for temporarily changing things.
-/// The original state gets restored when the Changer is destructed.
+/// Generic base for temporarily changing things. The derived class is
+/// responsible for restoring the original state when the Changer is
+/// destructed.
 template <class Struct, class Temp = Struct>
 class Changer {
-public:
-       ///
-       Changer(Struct & orig) : orig_(orig) {}
 protected:
+       ///
+       Changer(Struct & orig, Temp const & save) : orig_(orig), save_(save) {}
+       ///
+       Changer(Struct & orig) : orig_(orig), save_(orig) {}
        ///
        Struct & orig_;
        ///
@@ -225,7 +231,7 @@ public:
 class ColorChanger : public Changer<FontInfo, ColorCode> {
 public:
        ///
-       ColorChanger(FontInfo & font, docstring const & color,
+       ColorChanger(FontInfo & font, ColorCode color,
                     bool really_change_color = true);
        ///
        ~ColorChanger();