X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_fracinset.C;h=b694d72fe117a26e798080362cc9a36b8555597a;hb=b447408de232872fef1537fca542abc23702d572;hp=be4b75d496680321e8382a7b9a273be47360e0cc;hpb=285952e13002efe5d69a890e6e2a924b0c294808;p=lyx.git diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C index be4b75d496..b694d72fe1 100644 --- 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 #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 MathFracInset::clone() const { - return new MathFracInset(*this); + return auto_ptr(new MathFracInset(*this)); } @@ -37,21 +52,24 @@ void MathFracInset::metrics(MetricsInfo & mi, Dimension & dim) const FracChanger dummy(mi.base); cell(0).metrics(mi); cell(1).metrics(mi); - dim_.wid = max(cell(0).width(), cell(1).width()) + 2; - dim_.asc = cell(0).height() + 2 + 5; - dim_.des = cell(1).height() + 2 - 5; - dim = dim_; + 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 { + 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 + dim_.wid - 2, y - 5, LColor::math); + drawMarkers(pi, x, y); }