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

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index a711a2a416..05acbbbb04 100644
--- 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;
 	///
@@ -153,10 +157,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 +226,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