anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite RowPainter::paintOnlyInsets to use row elements

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2015-07-18 20:37:53 +02:00
parent d328fb2021
commit 038f003be6
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/RowPainter.cpp
View File

@ -606,27 +606,27 @@ void RowPainter::paintLast()
void RowPainter::paintOnlyInsets()
{
CoordCache const & cache = pi_.base.bv->coordCache();
pos_type const end = row_.endpos();
for (pos_type pos = row_.pos(); pos != end; ++pos) {
// If outer row has changed, nested insets are repaint completely.
Inset const * inset = par_.getInset(pos);
bool const nested_inset = inset &&
((inset->asInsetMath() &&
!inset->asInsetMath()->asMacroTemplate())
|| inset->asInsetText()
|| inset->asInsetTabular());
if (!nested_inset)
continue;
if (x_ > pi_.base.bv->workWidth()
|| !cache.getInsets().has(inset))
continue;
x_ = cache.getInsets().x(inset);
Font const font = text_metrics_.displayFont(pit_, pos);
paintInset(inset, font, par_.lookupChange(pos), pos);
Row::const_iterator cit = row_.begin();
Row::const_iterator const & end = row_.end();
for ( ; cit != end ; ++cit) {
Row::Element const & e = *cit;
if (e.type == Row::INSET) {
// If outer row has changed, nested insets are repainted completely.
pi_.base.bv->coordCache().insets().add(e.inset, int(x_), yo_);
bool const nested_inset =
(e.inset->asInsetMath() && !e.inset->asInsetMath()->asMacroTemplate())
|| e.inset->asInsetText() || e.inset->asInsetTabular();
if (!nested_inset) {
x_ += e.full_width();
continue;
}
paintInset(e.inset, e.font, e.change, e.pos);
} else
x_ += e.full_width();
}
}
void RowPainter::paintText()
{
Row::const_iterator cit = row_.begin();