X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathChar.cpp;h=f1e21131e10ef7e06957f7c68d61502ea8368b92;hb=12314897982e07afd8926c997f66d7bb08e7e1fd;hp=1b305ac38542477a52fe6898c3a99883c647ffae;hpb=ed858d73e57ce7aa89e38c1bc4d799362edb0227;p=lyx.git diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp index 1b305ac385..f1e21131e1 100644 --- a/src/mathed/InsetMathChar.cpp +++ b/src/mathed/InsetMathChar.cpp @@ -56,7 +56,7 @@ Inset * InsetMathChar::clone() const } -bool InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const { #if 1 if (char_ == '=' && has_math_fonts) { @@ -66,7 +66,7 @@ bool InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const FontSetChanger dummy(mi.base, "cmm"); dim = theFontMetrics(mi.base.font).dimension(char_); } else if (!slanted(char_) && mi.base.fontname == "mathnormal") { - ShapeChanger dummy(mi.base.font, Font::UP_SHAPE); + ShapeChanger dummy(mi.base.font, UP_SHAPE); dim = theFontMetrics(mi.base.font).dimension(char_); } else { frontend::FontMetrics const & fm = theFontMetrics(mi.base.font); @@ -85,12 +85,8 @@ bool InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const dim.wid += 2 * theFontMetrics(font_).width(' '); lyxerr << "InsetMathChar::metrics: " << dim << endl; #endif - - if (dim_ == dim) - return false; - - dim_ = dim; - return true; + // Cache the inset dimension. + setDimCache(mi, dim); } @@ -110,7 +106,7 @@ void InsetMathChar::draw(PainterInfo & pi, int x, int y) const FontSetChanger dummy(pi.base, "cmm"); pi.draw(x, y, char_); } else if (!slanted(char_) && pi.base.fontname == "mathnormal") { - ShapeChanger dummy(pi.base.font, Font::UP_SHAPE); + ShapeChanger dummy(pi.base.font, UP_SHAPE); pi.draw(x, y, char_); } else { pi.draw(x, y, char_);