X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDots.cpp;h=8c4bd8374b3f35b84cdf06d44f23436c39278ed7;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=147e7627e48e9fc7791bb9cf66ad8470ab93c69b;hpb=caf170d61206620eb0302f9809340746d642dec3;p=lyx.git diff --git a/src/mathed/InsetMathDots.cpp b/src/mathed/InsetMathDots.cpp index 147e7627e4..8c4bd8374b 100644 --- a/src/mathed/InsetMathDots.cpp +++ b/src/mathed/InsetMathDots.cpp @@ -13,6 +13,7 @@ #include "InsetMathDots.h" +#include "Dimension.h" #include "LaTeXFeatures.h" #include "MathStream.h" #include "MathSupport.h" @@ -25,7 +26,7 @@ namespace lyx { InsetMathDots::InsetMathDots(latexkeys const * key) - : key_(key) + : dh_(0), key_(key) {} @@ -53,12 +54,12 @@ void InsetMathDots::metrics(MetricsInfo & mi, Dimension & dim) const } -void InsetMathDots::draw(PainterInfo & pain, int x, int y) const +void InsetMathDots::draw(PainterInfo & pi, int x, int y) const { - Dimension const dim = dimension(*pain.base.bv); + Dimension const dim = dimension(*pi.base.bv); if (key_->name == "adots" || key_->name == "iddots") --y; - mathed_draw_deco(pain, x + 2, y - dh_, dim.width() - 2, dim.ascent(), + mathed_draw_deco(pi, x + 2, y - dh_, dim.width() - 2, dim.ascent(), key_->name); if (key_->name == "vdots" || key_->name == "ddots" || key_->name == "adots" || key_->name == "iddots") ++x; @@ -66,9 +67,8 @@ void InsetMathDots::draw(PainterInfo & pain, int x, int y) const ++y; else if (key_->name != "vdots") --y; - mathed_draw_deco(pain, x + 2, y - dh_, dim.width() - 2, dim.ascent(), + mathed_draw_deco(pi, x + 2, y - dh_, dim.width() - 2, dim.ascent(), key_->name); - setPosCache(pain, x, y); } @@ -81,7 +81,7 @@ docstring InsetMathDots::name() const void InsetMathDots::validate(LaTeXFeatures & features) const { if (!key_->requires.empty()) - features.require(to_utf8(key_->requires)); + features.require(key_->requires); }