macro rework

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

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index 5af56d7b53ac1d628fd6ae6ce88952da54bfa5a9..b694d72fe117a26e798080362cc9a36b8555597a 100644 (file)
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -1,12 +1,27 @@
+/**
+ * \file math_fracinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
 
 #include "math_fracinset.h"
-#include "math_support.h"
-#include "frontends/Painter.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "textpainter.h"
+#include "LColor.h"
+#include "frontends/Painter.h"
 
 
+using std::string;
 using std::max;
+using std::auto_ptr;
 
 
 MathFracInset::MathFracInset(bool atop)
@@ -14,9 +29,9 @@ MathFracInset::MathFracInset(bool atop)
 {}
 
 
-MathInset * MathFracInset::clone() const
+auto_ptr<InsetBase> MathFracInset::clone() const
 {
-       return new MathFracInset(*this);
+       return auto_ptr<InsetBase>(new MathFracInset(*this));
 }
 
 
@@ -32,45 +47,50 @@ MathFracInset const * MathFracInset::asFracInset() const
 }
 
 
-void MathFracInset::metrics(MetricsInfo & mi) const
+void MathFracInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FracChanger dummy(mi.base);
        cell(0).metrics(mi);
        cell(1).metrics(mi);
-       dim_.w = max(cell(0).width(), cell(1).width()) + 2;
-       dim_.a = cell(0).height() + 2 + 5;
-       dim_.d = cell(1).height() + 2 - 5;
+       dim.wid = max(cell(0).width(), cell(1).width()) + 2;
+       dim.asc = cell(0).height() + 2 + 5;
+       dim.des = cell(1).height() + 2 - 5;
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
 void MathFracInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m = x + width() / 2;
+       setPosCache(pi, x, y);
+       int m = x + dim_.wid / 2;
        FracChanger dummy(pi.base);
        cell(0).draw(pi, m - cell(0).width() / 2, y - cell(0).descent() - 2 - 5);
        cell(1).draw(pi, m - cell(1).width() / 2, y + cell(1).ascent()  + 2 - 5);
        if (!atop_)
-               pi.pain.line(x + 1, y - 5, x + width() - 2, y - 5, LColor::math);
+               pi.pain.line(x + 1, y - 5, x + dim_.wid - 2, y - 5, LColor::math);
+       drawMarkers(pi, x, y);
 }
 
 
-void MathFracInset::metricsT(TextMetricsInfo const & mi) const
+void MathFracInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
-       cell(0).metricsT(mi);
-       cell(1).metricsT(mi);
-       dim_.w = max(cell(0).width(), cell(1).width());
-       dim_.a = cell(0).height() + 1;
-       dim_.d = cell(1).height();
+       cell(0).metricsT(mi, dim);
+       cell(1).metricsT(mi, dim);
+       dim.wid = max(cell(0).width(), cell(1).width());
+       dim.asc = cell(0).height() + 1;
+       dim.des = cell(1).height();
+       //dim = dim_;
 }
 
 
 void MathFracInset::drawT(TextPainter & pain, int x, int y) const
 {
-       int m = x + width() / 2;
+       int m = x + dim_.width() / 2;
        cell(0).drawT(pain, m - cell(0).width() / 2, y - cell(0).descent() - 1);
        cell(1).drawT(pain, m - cell(1).width() / 2, y + cell(1).ascent());
        if (!atop_)
-               pain.horizontalLine(x, y, width());
+               pain.horizontalLine(x, y, dim_.width());
 }