X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIPA.cpp;h=c811cf6ff8fa3e34cea92cd3ba6b40067790092b;hb=22e6659780390a19174d1bf896317a5baf9e40d7;hp=387635831537a4c8b97bfec17f6e1addc1259809;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=lyx.git diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp index 3876358315..c811cf6ff8 100644 --- a/src/insets/InsetIPA.cpp +++ b/src/insets/InsetIPA.cpp @@ -35,7 +35,7 @@ using namespace std; namespace lyx { -InsetIPA::InsetIPA(Buffer * buf) +InsetIPA::InsetIPA(Buffer * buf) : InsetText(buf), preview_(new RenderPreview(this)) { @@ -44,7 +44,7 @@ InsetIPA::InsetIPA(Buffer * buf) } -InsetIPA::~InsetIPA() +InsetIPA::~InsetIPA() {} @@ -119,14 +119,14 @@ void InsetIPA::addPreview(DocIterator const & inset_pos, } -void InsetIPA::preparePreview(DocIterator const & pos) const +void InsetIPA::preparePreview(DocIterator const & pos) const { odocstringstream str; - otexstream os(str, false); + otexstream os(str); OutputParams runparams(&pos.buffer()->params().encoding()); latex(os, runparams); docstring const snippet = str.str(); - preview_->addPreview(snippet, *pos.buffer()); + preview_->addPreview(snippet, *pos.buffer()); } @@ -151,8 +151,7 @@ void InsetIPA::reloadPreview(DocIterator const & pos) const void InsetIPA::draw(PainterInfo & pi, int x, int y) const { if (previewState(pi.base.bv)) { - preview_->draw(pi, x + TEXT_TO_INSET_OFFSET, y); - setPosCache(pi, x, y); + preview_->draw(pi, x, y); return; } InsetText::draw(pi, x, y); @@ -181,19 +180,14 @@ void InsetIPA::metrics(MetricsInfo & mi, Dimension & dim) const { if (previewState(mi.base.bv)) { preview_->metrics(mi, dim); - mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET; - + dim.wid = max(dim.wid, 4); dim.asc = max(dim.asc, 4); - + dim.asc += TEXT_TO_INSET_OFFSET; dim.des += TEXT_TO_INSET_OFFSET; - dim.wid += TEXT_TO_INSET_OFFSET; - dim.wid += TEXT_TO_INSET_OFFSET; // insert a one pixel gap dim.wid += 1; - // Cache the inset dimension. - setDimCache(mi, dim); Dimension dim_dummy; MetricsInfo mi_dummy = mi; InsetText::metrics(mi_dummy, dim_dummy);