X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBig.cpp;h=117127e882ba2c303dfaa453d0b1e72dd3e2bef5;hb=12314897982e07afd8926c997f66d7bb08e7e1fd;hp=e56acca0785c713ac60d8d2c1bc18ce7537ef2a2;hpb=f497296c30e6da2f97b16da8ad1c9e96feffb16b;p=lyx.git diff --git a/src/mathed/InsetMathBig.cpp b/src/mathed/InsetMathBig.cpp index e56acca078..117127e882 100644 --- a/src/mathed/InsetMathBig.cpp +++ b/src/mathed/InsetMathBig.cpp @@ -22,8 +22,6 @@ namespace lyx { -using std::auto_ptr; - InsetMathBig::InsetMathBig(docstring const & name, docstring const & delim) : name_(name), delim_(delim) @@ -36,9 +34,9 @@ docstring InsetMathBig::name() const } -auto_ptr InsetMathBig::doClone() const +Inset * InsetMathBig::clone() const { - return auto_ptr(new InsetMathBig(*this)); + return new InsetMathBig(*this); } @@ -62,30 +60,29 @@ double InsetMathBig::increase() const } -bool InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const { double const h = theFontMetrics(mi.base.font).ascent('I'); double const f = increase(); dim.wid = 6; dim.asc = int(h + f * h); dim.des = int(f * h); - if (dim_ == dim) - return false; - dim_ = dim; - return true; + // Cache the inset dimension. + setDimCache(mi, dim); } void InsetMathBig::draw(PainterInfo & pi, int x, int y) const { + Dimension const dim = dimension(*pi.base.bv); // mathed_draw_deco does not use the leading backslash, so remove it // (but don't use ltrim if this is the backslash delimiter). // Replace \| by \Vert (equivalent in LaTeX), since mathed_draw_deco // would treat it as |. docstring const delim = (delim_ == "\\|") ? from_ascii("Vert") : (delim_ == "\\\\") ? from_ascii("\\") : support::ltrim(delim_, "\\"); - mathed_draw_deco(pi, x + 1, y - dim_.ascent(), 4, dim_.height(), - delim); + mathed_draw_deco(pi, x + 1, y - dim.ascent(), 4, dim.height(), + delim); setPosCache(pi, x, y); }