Move Color::color enum to ColorCode.h

[lyx.git] / src / mathed / InsetMathColor.cpp

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index ed63d12c19df59160edfe94315891c914813979b..e69b690db8386771c64f3c5bebdc3c894afa773d 100644 (file)
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -10,6 +10,7 @@
 
 #include <config.h>
 
+#include "Color.h"
 #include "InsetMathColor.h"
 #include "MathData.h"
 #include "MathStream.h"
@@ -21,7 +22,7 @@
 
 namespace lyx {
 
-InsetMathColor::InsetMathColor(bool oldstyle, Color_color const & color)
+InsetMathColor::InsetMathColor(bool oldstyle, ColorCode color)
        : InsetMathNest(1), oldstyle_(oldstyle),
          color_(from_utf8(lcolor.getLaTeXName(color)))
 {}
@@ -38,20 +39,18 @@ Inset * InsetMathColor::clone() const
 }
 
 
-bool InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
+       // Cache the inset dimension. 
+       setDimCache(mi, dim);
 }
 
 
 void InsetMathColor::draw(PainterInfo & pi, int x, int y) const
 {
-       Color_color origcol = pi.base.font.color();
+       ColorCode origcol = pi.base.font.color();
        pi.base.font.setColor(lcolor.getFromLaTeXName(to_utf8(color_)));
        cell(0).draw(pi, x + 1, y);
        pi.base.font.setColor(origcol);