Jean-Marc's fix for wrong descent

[lyx.git] / src / mathed / math_diminset.h

diff --git a/src/mathed/math_diminset.h b/src/mathed/math_diminset.h
index f8fe2897e1d4ee78709415c21a62df0865777cca..801aa9952b60060f2ac7f623b4e81fa2526b82ba 100644 (file)
--- a/src/mathed/math_diminset.h
+++ b/src/mathed/math_diminset.h
@@ -2,27 +2,31 @@
 #ifndef MATH_DIMINSET_H
 #define MATH_DIMINSET_H
 
+
 #include "math_inset.h"
+#include "dimension.h"
 
 /// things that need the dimension cache
 
 class MathDimInset : public MathInset {
 public:
        /// not sure whether the initialization is really necessary
-       MathDimInset() : width_(0), ascent_(0), descent_(0) {}
-       /// read ascent value (should be inline according to gprof) 
-       int ascent() const { return ascent_; }
-       /// read descent 
-       int descent() const { return descent_; }
+       MathDimInset() {}
+       /// read ascent value (should be inline according to gprof)
+       int ascent() const { return dim_.ascent(); }
+       /// read descent
+       int descent() const { return dim_.descent(); }
        /// read width
-       int width() const { return width_; }
-
-protected:
+       int width() const { return dim_.width(); }
        ///
-       mutable int width_;
+       Dimension dimensions() const { return dim_; }
        ///
-       mutable int ascent_;
+       void metricsT(TextMetricsInfo const &) const;
+       ///
+       void drawT(TextPainter & pain, int x, int y) const;
+
+protected:
        ///
-       mutable int descent_;
+       mutable Dimension dim_;
 };
 #endif