* cosmetic

[lyx.git] / src / ColorCode.h

diff --git a/src/ColorCode.h b/src/ColorCode.h
index 8df8ff4c8fcecf8bde4298a62e482fd15a6fad16..cee2c007568ff338818d5dd23ccb546e1956ab51 100644 (file)
--- a/src/ColorCode.h
+++ b/src/ColorCode.h
@@ -48,22 +48,39 @@ enum ColorCode
        Color_latex,
        /// The color used for previews
        Color_preview,
+       /// Inline completion color
+       Color_inlinecompletion,
+       /// Inline completion color for the non-unique part
+       Color_nonunique_inlinecompletion,
 
-       /// Text color for notes
-       Color_note,
+       /// Label color for notes
+       Color_notelabel,
        /// Background color of notes
        Color_notebg,
-       /// Text color for comments
-       Color_comment,
+       /// Label color for comments
+       Color_commentlabel,
        /// Background color of comments
        Color_commentbg,
-       /// Text color for greyedout inset
-       Color_greyedout,
+       /// Label color for greyedout insets
+       Color_greyedoutlabel,
        /// Background color of greyedout inset
        Color_greyedoutbg,
        /// Shaded box background
        Color_shadedbg,
 
+       /// Label color for branches
+       Color_branchlabel,
+       /// Label color for footnotes
+       Color_footlabel,
+       /// Label color for index insets
+       Color_indexlabel,
+       /// Label color for margin notes
+       Color_marginlabel,
+       /// Label color for URL insets
+       Color_urllabel,
+       /// Label color for URL text
+       Color_urltext,
+
        /// Color for the depth bars in the margin
        Color_depthbar,
        /// Color for marking foreign language words
@@ -87,6 +104,18 @@ enum ColorCode
        Color_mathbg,
        /// Macro math inset background color
        Color_mathmacrobg,
+       /// Macro math inset background color hovered
+       Color_mathmacrohoverbg,
+       /// Macro math label color
+       Color_mathmacrolabel,
+       /// Macro math frame color
+       Color_mathmacroframe,
+       /// Macro math blended color 
+       Color_mathmacroblend,
+       /// Macro template color for old parameters 
+       Color_mathmacrooldarg,
+       /// Macro template color for new parameters 
+       Color_mathmacronewarg,
        /// Math inset frame color under focus
        Color_mathframe,
        /// Math inset frame color not under focus
@@ -129,6 +158,8 @@ enum ColorCode
        Color_tabularonoffline,
        /// Bottom area color
        Color_bottomarea,
+       /// New page color
+       Color_newpage,
        /// Page break color
        Color_pagebreak,
 
@@ -148,6 +179,27 @@ enum ColorCode
        Color_ignore
 };
 
+
+struct RGBColor {
+       unsigned int r;
+       unsigned int g;
+       unsigned int b;
+       RGBColor() : r(0), g(0), b(0) {}
+       RGBColor(unsigned int red, unsigned int green, unsigned int blue)
+               : r(red), g(green), b(blue) {}
+};
+
+inline bool operator==(RGBColor const & c1, RGBColor const & c2)
+{
+       return (c1.r == c2.r && c1.g == c2.g && c1.b == c2.b);
+}
+
+
+inline bool operator!=(RGBColor const & c1, RGBColor const & c2)
+{
+       return !(c1 == c2);
+}
+
 } // namespace lyx
 
 #endif