X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=1ba228702a3c4a10cce8eddae9fe354339e8d6ab;hpb=fb9470847205a4ecd95b9107244e5f0b3a296969;p=lyx.git diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 1ba228702a..16f8c3c58b 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -27,8 +27,8 @@ #include "math_mathmlstream.h" #include "BufferView.h" #include "gettext.h" -#include "Painter.h" -#include "font.h" +#include "frontends/Painter.h" +#include "frontends/font_metrics.h" #include "support/lyxlib.h" #include "support/LOstream.h" #include "debug.h" @@ -99,7 +99,7 @@ int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const } -int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const +int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const { return ascii(buf, os, 0); } @@ -136,7 +136,7 @@ int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const { metrics(bv, f); - return 10 + lyxfont::width(prefix(), f) + par()->width(); + return 10 + font_metrics::width(prefix(), f) + par()->width(); } @@ -167,7 +167,7 @@ MathInsetTypes InsetFormulaMacro::getType() const void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, int y, float & xx, bool /*cleared*/) const { - Painter & pain = bv->painter(); + MathPainterInfo pain = MathPainterInfo(bv->painter()); LyXFont font(f); // label @@ -179,17 +179,17 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, int const h = ascent(bv, font) + descent(bv, font) - 2; // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too - pain.fillRectangle(x, a, w, h, LColor::mathmacrobg); - pain.rectangle(x, a, w, h, LColor::mathframe); + pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg); + pain.pain.rectangle(x, a, w, h, LColor::mathframe); if (mathcursor && const_cast(mathcursor->formula()) == this) mathcursor->drawSelection(pain); - pain.text(x + 2, y, prefix(), font); + pain.pain.text(x + 2, y, prefix(), font); // formula - par()->draw(pain, xx + lyxfont::width(prefix(), f) + 5, yo_); + par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y); xx += w + 2; xo_ = x; yo_ = y;