whitespace

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 12fff6fa5d8723b5baec18c350bbe9dd48b6a757..020b25f87428baa84e912aa915c518beb082177f 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -13,6 +13,7 @@
 #ifndef METRICSINFO_H
 #define METRICSINFO_H
 
+#include "Changes.h"
 #include "ColorCode.h"
 #include "FontInfo.h"
 
@@ -102,14 +103,19 @@ 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;
        ///
        frontend::Painter & pain;
        /// Whether the text at this point is right-to-left (for InsetNewline)
        bool ltr_pos;
-       /// Whether the parent is deleted (change tracking)
-       bool erased_;
+       /// The change the parent is part of (change tracking)
+       Change change_;
        /// Whether the parent is selected as a whole
        bool selected;
        ///
@@ -152,10 +158,15 @@ public:
 class FontSetChanger : public Changer<MetricsBase> {
 public:
        ///
-       FontSetChanger(MetricsBase & mb, docstring const & font);
-       FontSetChanger(MetricsBase & mb, char const * const font);
+       FontSetChanger(MetricsBase & mb, docstring const & font,
+                       bool really_change_font = true);
+       FontSetChanger(MetricsBase & mb, char const * const font,
+                       bool really_change_font = true);
        ///
        ~FontSetChanger();
+private:
+       ///
+       bool change_;
 };
 
 
@@ -216,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