rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

[lyx.git] / src / mathed / math_undersetinset.C

diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C
index 5e42606b42426fcb585bf81b7fe6087b209f43ec..50b60c899917372853ab4e3f336338c8b2173675 100644 (file)
--- a/src/mathed/math_undersetinset.C
+++ b/src/mathed/math_undersetinset.C
@@ -1,40 +1,40 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_undersetinset.h"
 #include "math_mathmlstream.h"
 #include "math_support.h"
 
 
+using std::max;
+
+
 MathUndersetInset::MathUndersetInset()
 {}
 
 
 MathInset * MathUndersetInset::clone() const
-{   
+{
        return new MathUndersetInset(*this);
 }
 
 
-void MathUndersetInset::metrics(MathMetricsInfo const & mi) const
+void MathUndersetInset::metrics(MathMetricsInfo & mi) const
 {
-       MathMetricsInfo m = mi;
-       smallerStyleFrac(m);
-       xcell(0).metrics(m);
-       xcell(1).metrics(mi);
-       width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
-       ascent_  = xcell(1).ascent();
-       descent_ = xcell(1).descent() + xcell(0).height() + 4;
+       cell(1).metrics(mi);
+       MathFracChanger dummy(mi.base);
+       cell(0).metrics(mi);
+       dim_.w = max(cell(0).width(), cell(1).width()) + 4;
+       dim_.a = cell(1).ascent();
+       dim_.d = cell(1).descent() + cell(0).height() + 4;
 }
 
 
-void MathUndersetInset::draw(Painter & pain, int x, int y) const
+void MathUndersetInset::draw(MathPainterInfo & pi, int x, int y) const
 {
        int m  = x + width() / 2;
-       int yo = y + xcell(1).descent() + xcell(0).ascent() + 1;
-       xcell(0).draw(pain, m - xcell(0).width() / 2, yo);
-       xcell(1).draw(pain, m - xcell(1).width() / 2, y);
+       int yo = y + cell(1).descent() + cell(0).ascent() + 1;
+       cell(1).draw(pi, m - cell(1).width() / 2, y);
+       MathFracChanger dummy(pi.base);
+       cell(0).draw(pi, m - cell(0).width() / 2, yo);
 }