X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.h;h=d717a54282b612147c4c903df076a98dbcaf6ed2;hb=604a3341d9bd6b6bee6f042292f28b89027ca2b5;hp=a711a2a416e14a303ba8a055dfb62b1887d19cbb;hpb=09a0e37b15d99167e6320af56aa124aac3694dd4;p=lyx.git

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index a711a2a416..d717a54282 100644
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -14,7 +14,7 @@
 #define METRICSINFO_H
 
 #include "Changes.h"
-#include "ColorCode.h"
+#include "Color.h"
 #include "FontInfo.h"
 
 #include "support/strfwd.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 selectio state. 
+	/// \param color what the color should be by default
+	Color textColor(Color const & color) const;
+
 	///
 	MetricsBase base;
 	///
@@ -153,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_;
 };
 
 
@@ -217,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, docstring const & color,
+		     bool really_change_color = true);
 	///
 	~ColorChanger();
+private:
+	///
+	bool change_;
 };
 
 } // namespace lyx