-#include <config.h>
+/**
+ * \file math_fboxinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+#include <config.h>
#include "math_fboxinset.h"
-#include "math_support.h"
+#include "math_data.h"
#include "math_mathmlstream.h"
-#include "math_streamstr.h"
#include "math_parser.h"
+#include "math_streamstr.h"
+#include "LColor.h"
#include "frontends/Painter.h"
+using std::auto_ptr;
MathFboxInset::MathFboxInset(latexkeys const * key)
{}
-MathInset * MathFboxInset::clone() const
+auto_ptr<InsetBase> MathFboxInset::clone() const
{
- return new MathFboxInset(*this);
+ return auto_ptr<InsetBase>(new MathFboxInset(*this));
}
}
-void MathFboxInset::metrics(MathMetricsInfo & mi) const
+void MathFboxInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
if (key_->name == "fbox") {
- MathFontSetChanger dummy(mi.base, "textnormal");
- dim_ = cell(0).metrics(mi);
- metricsMarkers2(5); // 5 pixels margin
+ FontSetChanger dummy(mi.base, "textnormal");
+ cell(0).metrics(mi, dim);
} else {
- dim_ = cell(0).metrics(mi);
- metricsMarkers2(5); // 5 pixels margin
+ cell(0).metrics(mi, dim);
}
+ metricsMarkers(dim, 5); // 5 pixels margin
+ dim_ = dim;
}
-void MathFboxInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathFboxInset::draw(PainterInfo & pi, int x, int y) const
{
- pi.pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2,
- LColor::black);
+ pi.pain.rectangle(x + 1, y - dim_.ascent() + 1,
+ dim_.width() - 2, dim_.height() - 2, LColor::foreground);
if (key_->name == "fbox") {
- MathFontSetChanger dummy(pi.base, "textnormal");
+ FontSetChanger dummy(pi.base, "textnormal");
cell(0).draw(pi, x + 5, y);
} else {
cell(0).draw(pi, x + 5, y);