GuiDocument.cpp: remove unneeded conversion

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 24951445baea97bd575f4665d8add94624d0951d..8db78d5ce1a492fe52e7ada0ecbf491cc1df9ba2 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -19,6 +19,7 @@
 #include "tex2lyx/Font.h"
 #else
 
+#include "Color.h"
 #include "ColorCode.h"
 #include "FontEnums.h"
 
@@ -41,9 +42,9 @@ public:
                FontState emph,
                FontState underbar,
                FontState noun,
-               FontState number
-               ): family_(family), series_(series), shape_(shape), size_(size), 
-               color_(color), background_(background), emph_(emph),
+               FontState number)
+               : family_(family), series_(series), shape_(shape), size_(size), 
+               color_(color), background_(background), paint_color_(), emph_(emph),
                underbar_(underbar), noun_(noun), number_(number)
        {}
 
@@ -88,8 +89,11 @@ public:
        /// Is a given font fully resolved?
        bool resolved() const;
 
-       ///
-       ColorCode realColor() const;
+       /// The real color of the font. This can be the color that is 
+       /// set for painting, the color of the font or a default color.
+       Color realColor() const;
+       /// Sets the color which is used during painting
+       void setPaintColor(Color c) { paint_color_ = c; }
 
        /// Converts logical attributes to concrete shape attribute
        /// Try hard to inline this as it shows up with 4.6 % in the profiler.
@@ -134,6 +138,8 @@ private:
        ColorCode color_;
        ///
        ColorCode background_;
+       /// The color used for painting
+       Color paint_color_;
        ///
        FontState emph_;
        ///