Add a new Color class. This class makes it possible to specify a color as a merging...

[features.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index 19d596b4838e87c336029f4843d00ec7cf9dac31..6c6e32481fbdccbb67eb7b387169128f7648c28e 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -84,6 +84,45 @@ RGBColor rgbFromHexName(string const & x11hexname)
 }
 
 
+Color::Color(ColorCode base_color) : baseColor(base_color), 
+       mergeColor(Color_ignore)
+{}
+
+
+bool Color::operator==(Color const & color) const
+{
+       return baseColor == color.baseColor;
+}
+
+
+bool Color::operator!=(Color const & color) const      
+{
+       return baseColor != color.baseColor;
+}
+
+
+bool Color::operator<(Color const & color) const
+{
+       return baseColor < color.baseColor;
+}
+
+
+bool Color::operator<=(Color const & color) const
+{
+       return baseColor <= color.baseColor;
+}
+
+
+std::ostream & operator<<(std::ostream & os, Color color)
+{
+       os << to_ascii(lcolor.getGUIName(color.baseColor));
+       if (color.mergeColor != Color_ignore)
+               os << "[merged with:"
+                       << to_ascii(lcolor.getGUIName(color.mergeColor)) << "]";
+       return os;
+}
+
+
 ColorSet::ColorSet()
 {
        char const * grey40 = "#666666";
@@ -119,7 +158,7 @@ ColorSet::ColorSet()
        { Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
        { Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" },
        { Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
-       { Color_phantomtext, N_("phantom inset text"), "phantomtext", grey80, "phantomtext" },
+       { Color_phantomtext, N_("phantom inset text"), "phantomtext", "#7f7f7f", "phantomtext" },
        { Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
        { Color_listingsbg, N_("listings background"), "listingsbg", "white", "listingsbg" },
        { Color_branchlabel, N_("branch label"), "branchlabel", "#c88000", "branchlabel" },