X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLine.cpp;h=f2944c85a518eb67a65fc4adde4652b8a65e3724;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=1b5966aaeedc5c7c1bc440846488be96f621dac2;hpb=5008ee540f84715cd10e87f3fa0cd5dc7b974784;p=lyx.git diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp index 1b5966aaee..f2944c85a5 100644 --- a/src/insets/InsetLine.cpp +++ b/src/insets/InsetLine.cpp @@ -12,23 +12,26 @@ #include "InsetLine.h" -#include "debug.h" -#include "Color.h" -#include "LyXText.h" +#include "Dimension.h" +#include "Font.h" #include "MetricsInfo.h" #include "LaTeXFeatures.h" #include "OutputParams.h" +#include "Text.h" #include "frontends/Painter.h" +#include "support/debug.h" +#include "support/docstream.h" + + + +using namespace std; namespace lyx { using frontend::Painter; -using std::endl; -using std::ostream; - void InsetLine::read(Buffer const &, Lexer &) { @@ -42,26 +45,26 @@ void InsetLine::write(Buffer const &, ostream & os) const } -bool InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const { dim.asc = 3; dim.des = 3; dim.wid = mi.base.textwidth; - bool const changed = dim_ != dim; - dim_ = dim; - return changed; + // Cache the inset dimension. + setDimCache(mi, dim); } void InsetLine::draw(PainterInfo & pi, int x, int y) const { - pi.pain.line(x, y, x + dim_.wid, y, Color::topline, Painter::line_solid, - Painter::line_thick); + Dimension const dim = dimension(*pi.base.bv); + pi.pain.line(x, y, x + dim.wid, y, Color_topline, + Painter::line_solid, Painter::line_thick); } int InsetLine::latex(Buffer const &, odocstream & os, - OutputParams const & runparams) const + OutputParams const & runparams) const { os << "\\lyxline{\\" << from_ascii(runparams.local_font->latexSize()) << '}'; @@ -70,7 +73,7 @@ int InsetLine::latex(Buffer const &, odocstream & os, int InsetLine::plaintext(Buffer const &, odocstream & os, - OutputParams const &) const + OutputParams const &) const { os << "\n-------------------------------------------\n"; return PLAINTEXT_NEWLINE;