#include "insets/InsetText.h"
-#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathMacroTemplate.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
+#include "frontends/NullPainter.h"
#include "support/debug.h"
#include "support/lassert.h"
}
-}
+} // namespace
/////////////////////////////////////////////////////////////////////
//
}
+void TextMetrics::updatePosCache(pit_type pit) const
+{
+ frontend::NullPainter np;
+ PainterInfo pi(bv_, np);
+ drawParagraph(pi, pit, origin_.x_, par_metrics_[pit].position());
+}
+
+
int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
{
return text_->isMainText() ? pm.rightMargin(*bv_) : 0;
// do the metric calculation
Dimension dim;
- int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
+ int const w = max_width_ - leftMargin(pit, ii->pos)
- right_margin - eop;
Font const & font = ii->inset->inheritFont() ?
displayFont(pit, ii->pos) : bufferfont;
break;
case LYX_ALIGN_LEFT:
// a displayed inset that is flushed
- if (Inset const * inset = par.getInset(row.pos()))
+ if (Inset const * inset = par.getInset(row.pos())) {
row.left_margin += inset->indent(*bv_);
+ row.dimension().wid += inset->indent(*bv_);
+ }
break;
case LYX_ALIGN_RIGHT:
if (Inset const * inset = par.getInset(row.pos())) {
if (text_->getPar(pit).layout().margintype != MARGIN_MANUAL)
return 0;
// return the beginning of the body
- return leftMargin(max_width_, pit);
+ return leftMargin(pit);
}
namespace {
pos_type bodypos_;
};
-} // anon namespace
+} // namespace
/** This is the function where the hard work is done. The code here is
* very sensitive to small changes :) Note that part of the
bool need_new_row = false;
row.clear();
- row.left_margin = leftMargin(max_width_, row.pit(), pos);
+ row.left_margin = leftMargin(row.pit(), pos);
row.right_margin = right_margin;
if (is_rtl)
swap(row.left_margin, row.right_margin);
// if the row is too large, try to cut at last separator. In case
// of success, reset indication that the row was broken abruptly.
- int const next_width = max_width_ - leftMargin(max_width_, row.pit(), row.endpos())
+ int const next_width = max_width_ - leftMargin(row.pit(), row.endpos())
- rightMargin(row.pit());
- row.shortenIfNeeded(body_pos, width, next_width);
+ if (row.shortenIfNeeded(body_pos, width, next_width))
+ row.flushed(false);
row.right_boundary(!row.empty() && row.endpos() < end
&& row.back().endpos == row.endpos());
// Last row in paragraph is flushed
redoParagraph(pit);
par_metrics_[pit].setPosition(last.second.position()
+ last.second.descent() + par_metrics_[pit].ascent());
+ updatePosCache(pit);
}
redoParagraph(pit);
par_metrics_[pit].setPosition(first.second.position()
- first.second.ascent() - par_metrics_[pit].descent());
+ updatePosCache(pit);
}
// y is screen coordinate
}
-int TextMetrics::leftMargin(int max_width, pit_type pit) const
+int TextMetrics::leftMargin(pit_type pit) const
{
- return leftMargin(max_width, pit, text_->paragraphs()[pit].size());
+ return leftMargin(pit, text_->paragraphs()[pit].size());
}
-int TextMetrics::leftMargin(int max_width,
- pit_type const pit, pos_type const pos) const
+int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const
{
ParagraphList const & pars = text_->paragraphs();
int nestmargin = depth * nestMargin();
if (text_->isMainText())
nestmargin += changebarMargin();
- l_margin = max(leftMargin(max_width, newpar), nestmargin);
+ l_margin = max(leftMargin(newpar), nestmargin);
// Remove the parindent that has been added
// if the paragraph was empty.
if (pars[newpar].empty() &&
ParagraphMetrics const & pm = par_metrics_[pit];
RowList::const_iterator rit = pm.rows().begin();
RowList::const_iterator end = pm.rows().end();
- int minfill = max_width;
+ int minfill = max_width_;
for ( ; rit != end; ++rit)
if (rit->fill() < minfill)
minfill = rit->fill();
l_margin += minfill;
#endif
// also wrong, but much shorter.
- l_margin += max_width / 2;
+ l_margin += max_width_ / 2;
break;
}
}
if (!par.params().leftIndent().zero())
- l_margin += par.params().leftIndent().inPixels(max_width, lfm.em());
+ l_margin += par.params().leftIndent().inPixels(max_width_, lfm.em());
LyXAlignment align = par.getAlign();
return;
size_t const nrows = pm.rows().size();
- // Use fast lane when drawing is disabled.
- if (!pi.pain.isDrawingEnabled()) {
+ // Use fast lane in nodraw stage.
+ if (pi.pain.isNull()) {
for (size_t i = 0; i != nrows; ++i) {
Row const & row = pm.rows()[i];
if (i)
y += row.ascent();
- RowPainter rp(pi, *text_, row, row_x, y);
-
// It is not needed to draw on screen if we are not inside.
bool const inside = (y + row.descent() >= 0
&& y - row.ascent() < ww);
- pi.pain.setDrawingEnabled(inside);
if (!inside) {
- // Paint only the insets to set inset cache correctly
- // FIXME: remove paintOnlyInsets when we know that positions
- // have already been set.
- rp.paintOnlyInsets();
+ // Inset positions have already been set in nodraw stage.
y += row.descent();
continue;
}
// Row signature; has row changed since last paint?
row.setCrc(pm.computeRowSignature(row, *bv_));
bool row_has_changed = row.changed()
- || bv_->hadHorizScrollOffset(text_, pit, row.pos());
+ || bv_->hadHorizScrollOffset(text_, pit, row.pos())
+ || bv_->needRepaint(text_, row);
// Take this opportunity to spellcheck the row contents.
if (row_has_changed && pi.do_spellcheck && lyxrc.spellcheck_continuously) {
text_->getPar(pit).spellCheck();
}
+ RowPainter rp(pi, *text_, row, row_x, y);
+
// Don't paint the row if a full repaint has not been requested
// and if it has not changed.
if (!pi.full_repaint && !row_has_changed) {
// Instrumentation for testing row cache (see also
// 12 lines lower):
if (lyxerr.debugging(Debug::PAINTING)
- && (row.selection() || pi.full_repaint || row_has_changed)) {
- string const foreword = text_->isMainText() ?
- "main text redraw " : "inset text redraw: ";
- LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i
+ && (row.selection() || pi.full_repaint || row_has_changed)) {
+ string const foreword = text_->isMainText() ? "main text redraw "
+ : "inset text redraw: ";
+ LYXERR0(foreword << "pit=" << pit << " row=" << i
<< " row_selection=" << row.selection()
<< " full_repaint=" << pi.full_repaint
<< " row_has_changed=" << row_has_changed
- << " drawingEnabled=" << pi.pain.isDrawingEnabled());
+ << " null painter=" << pi.pain.isNull());
}
// Backup full_repaint status and force full repaint
// Restore full_repaint status.
pi.full_repaint = tmp;
}
- // Re-enable screen drawing for future use of the painter.
- pi.pain.setDrawingEnabled(true);
//LYXERR(Debug::PAINTING, ".");
}