#include "CoordCache.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "HSpace.h"
#include "InsetList.h"
#include "Language.h"
#include "Layout.h"
#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/convert.h"
#include "support/debug.h"
#include "support/lassert.h"
+#include <stdlib.h>
#include <cmath>
using namespace std;
}
-}
+} // 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;
// FIXME: This check ought to be done somewhere else. It is the reason
// why text_ is not const. But then, where else to do it?
// Well, how can you end up with either (a) a biblio environment that
- // has no InsetBibitem or (b) a biblio environment with more than one
- // InsetBibitem? I think the answer is: when paragraphs are merged;
+ // has no InsetBibitem, (b) a biblio environment with more than one
+ // InsetBibitem or (c) a paragraph that has a bib item but is no biblio
+ // environment? I think the answer is: when paragraphs are merged;
// when layout is set; when material is pasted.
if (par.brokenBiblio()) {
Cursor & cur = const_cast<Cursor &>(bv_->cursor());
}
// redo insets
+ par.setBeginOfBody();
Font const bufferfont = buffer.params().getFont();
CoordCache::Insets & insetCache = bv_->coordCache().insets();
InsetList::const_iterator ii = par.insetList().begin();
parPos.pos()++;
}
+ // If there is an end of paragraph marker, its size should be
+ // substracted to the available width. The logic here is
+ // almost the same as in breakRow, remember keep them in sync.
+ int eop = 0;
+ if (lyxrc.paragraph_markers && ii->pos + 1 == par.size()
+ && size_type(pit + 1) < text_->paragraphs().size()) {
+ Font f(text_->layoutFont(pit));
+ // ¶ U+00B6 PILCROW SIGN
+ eop = theFontMetrics(f).width(char_type(0x00B6));
+ }
+
// do the metric calculation
Dimension dim;
- int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
- - right_margin;
+ int const w = max_width_ - leftMargin(pit, ii->pos)
+ - right_margin - eop;
Font const & font = ii->inset->inheritFont() ?
displayFont(pit, ii->pos) : bufferfont;
MacroContext mc(&buffer, parPos);
}
}
- par.setBeginOfBody();
pos_type first = 0;
size_t row_index = 0;
bool need_new_row = false;
row.pit(pit);
need_new_row = breakRow(row, right_margin);
setRowHeight(row);
- row.setChanged(false);
+ row.changed(true);
if (row_index || row.endpos() < par.size()
|| (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE)) {
/* If there is more than one row or the row has been
first = row.endpos();
++row_index;
- pm.dim().wid = max(pm.dim().wid, row.width());
+ pm.dim().wid = max(pm.dim().wid, row.width() + row.right_margin);
pm.dim().des += row.height();
} while (first < par.size() || need_new_row);
// specially tailored for the main text.
// Top and bottom margin of the document (only at top-level)
if (text_->isMainText()) {
+ // original value was 20px, which is 0.2in at 100dpi
+ int const margin = Length(0.2, Length::IN).inPixels(0);
if (pit == 0) {
- pm.rows().front().dimension().asc += 20;
- pm.dim().des += 20;
+ pm.rows().front().dimension().asc += margin;
+ /* coverity thinks that we should update pm.dim().asc
+ * below, but all the rows heights are actually counted as
+ * part of the paragraph metric descent see loop above).
+ */
+ // coverity[copy_paste_error]
+ pm.dim().des += margin;
}
ParagraphList const & pars = text_->paragraphs();
if (pit + 1 == pit_type(pars.size())) {
- pm.rows().back().dimension().des += 20;
- pm.dim().des += 20;
+ pm.rows().back().dimension().des += margin;
+ pm.dim().des += margin;
}
}
LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
{
- Layout const & layout = par.layout();
-
- LyXAlignment align;
- if (par.params().align() == LYX_ALIGN_LAYOUT)
- align = layout.align;
- else
- align = par.params().align();
+ LyXAlignment align = par.getAlign(bv_->buffer().params());
// handle alignment inside tabular cells
Inset const & owner = text_->inset();
// not justify stuff, then don't stretch.
// A forced block alignment can only be overridden the 'no
// justification on screen' setting.
- if (((row.right_boundary() || row.endpos() == par.size())
- && !forced_block)
+ if ((row.flushed() && !forced_block)
|| !bv_->buffer().params().justification)
- align = text_->isRTL(par) ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT;
+ align = row.isRTL() ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT;
}
return align;
// Common case : there is no hfill, and the alignment will be
// meaningful
switch (getAlign(par, row)) {
- case LYX_ALIGN_BLOCK: {
- int const ns = row.countSeparators();
- // If we have separators, then stretch the row
- if (ns) {
- row.setSeparatorExtraWidth(double(w) / ns);
- row.dimension().wid += w;
- } else if (text_->isRTL(par)) {
+ case LYX_ALIGN_BLOCK:
+ // Expand expanding characters by a total of w
+ if (!row.setExtraWidth(w) && row.isRTL()) {
+ // Justification failed and the text is RTL: align to the right
row.left_margin += w;
row.dimension().wid += w;
}
break;
- }
+ case LYX_ALIGN_LEFT:
+ // a displayed inset that is flushed
+ 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:
- row.left_margin += w;
- row.dimension().wid += w;
+ if (Inset const * inset = par.getInset(row.pos())) {
+ int const new_w = max(w - inset->indent(*bv_), 0);
+ row.left_margin += new_w;
+ row.dimension().wid += new_w;
+ } else {
+ row.left_margin += w;
+ row.dimension().wid += w;
+ }
break;
case LYX_ALIGN_CENTER:
row.dimension().wid += w / 2;
row.left_margin += w / 2;
break;
- case LYX_ALIGN_LEFT:
case LYX_ALIGN_NONE:
case LYX_ALIGN_LAYOUT:
case LYX_ALIGN_SPECIAL:
return;
}
+ // Case nh > 0. There are hfill separators.
hfill = w / nh;
hfill_rem = w % nh;
row.dimension().wid += w;
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;
+ row.needsChangeBar(false);
if (is_rtl)
swap(row.left_margin, row.right_margin);
// Remember that the row width takes into account the left_margin
// the width available for the row.
int const width = max_width_ - row.right_margin;
- if (pos >= end || row.width() > width) {
- row.endpos(end);
- return need_new_row;
- }
-
#if 0
//FIXME: As long as leftMargin() is not correctly implemented for
// MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here.
// or the end of the par, then build a representation of the row.
pos_type i = pos;
FontIterator fi = FontIterator(*this, par, row.pit(), pos);
- do {
- // this can happen for an empty row after a newline
- if (i >= end)
- break;
+ while (i < end && (i == pos || row.width() <= width)) {
char_type c = par.getChar(i);
// The most special cases are handled first.
if (par.isInset(i)) {
} else if (c == '\t')
row.addSpace(i, theFontMetrics(*fi).width(from_ascii(" ")),
*fi, par.lookupChange(i));
- else {
+ else if (c == 0x2028 || c == 0x2029) {
+ /**
+ * U+2028 LINE SEPARATOR
+ * U+2029 PARAGRAPH SEPARATOR
+
+ * These are special unicode characters that break
+ * lines/pragraphs. Not handling them lead to trouble wrt
+ * Qt QTextLayout formatting. We add a visible character
+ * on screen so that the user can see that something is
+ * happening.
+ */
+ row.finalizeLast();
+ // ⤶ U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS
+ // ¶ U+00B6 PILCROW SIGN
+ char_type const screen_char = (c == 0x2028) ? 0x2936 : 0x00B6;
+ row.add(i, screen_char, *fi, par.lookupChange(i));
+ } else {
// FIXME: please someone fix the Hebrew/Arabic parenthesis mess!
// see also Paragraph::getUChar.
if (fi->language()->lang() == "hebrew") {
&& inset->display())
|| (!row.empty() && row.back().inset
&& row.back().inset->display())) {
- row.right_boundary(true);
+ row.flushed(true);
need_new_row = par.isNewline(i);
++i;
break;
++i;
++fi;
- } while (i < end && row.width() <= width);
+ }
row.finalizeLast();
row.endpos(i);
- // End of paragraph marker
+ // End of paragraph marker. The logic here is almost the
+ // same as in redoParagraph, remember keep them in sync.
ParagraphList const & pars = text_->paragraphs();
if (lyxrc.paragraph_markers && !need_new_row
&& i == end && size_type(row.pit() + 1) < pars.size()) {
BufferParams const & bparams
= text_->inset().buffer().params();
f.setLanguage(par.getParLanguage(bparams));
+ // ¶ U+00B6 PILCROW SIGN
row.addVirtual(end, docstring(1, char_type(0x00B6)), f, Change());
}
+ // Is there a end-of-paragaph change?
+ if (i == end && par.lookupChange(end).changed() && !need_new_row)
+ row.needsChangeBar(true);
+
// if the row is too large, try to cut at last separator. In case
// of success, reset indication that the row was broken abruptly.
- if (row.shortenIfNeeded(body_pos, width))
- row.right_boundary(false);
+ int const next_width = max_width_ - leftMargin(row.pit(), row.endpos())
+ - rightMargin(row.pit());
+
+ 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
+ if (row.endpos() == end)
+ row.flushed(true);
// make sure that the RTL elements are in reverse ordering
row.reverseRTL(is_rtl);
* how boundary helps here.
*/
else if (pos == cit->endpos
- && cit + 1 != row.end()
- && cit->isRTL() != (cit + 1)->isRTL())
+ && ((!cit->isRTL() && cit + 1 != row.end()
+ && (cit + 1)->isRTL())
+ || (cit->isRTL() && cit != row.begin()
+ && !(cit - 1)->isRTL())))
boundary = true;
}
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
}
pit_type pit = getPitNearY(y);
LASSERT(pit != -1, return 0);
-
- int yy = y; // is modified by getPitAndRowNearY
- Row const & row = getPitAndRowNearY(yy, pit, assert_in_view, up);
-
+ Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up);
cur.pit() = pit;
// Do we cover an inset?
- InsetList::InsetTable * it = checkInsetHit(pit, x, yy);
+ InsetList::InsetTable * it = checkInsetHit(pit, x, y);
if (!it) {
// No inset, set position in the text
bool bound = false; // is modified by getPosNearX
- int xx = x; // is modified by getPosNearX
- cur.pos() = getPosNearX(row, xx, bound);
+ cur.pos() = getPosNearX(row, x, bound);
cur.boundary(bound);
cur.setCurrentFont();
- cur.setTargetX(xx);
+ cur.setTargetX(x);
return 0;
}
cur.setTargetX(x);
// Try to descend recursively inside the inset.
- Inset * edited = inset->editXY(cur, x, yy);
- if (edited == inset && cur.pos() == it->pos) {
+ Inset * edited = inset->editXY(cur, x, y);
+ // FIXME: it is not clear that the test on position is needed
+ // Remove it if/when semantics of editXY is clarified
+ if (cur.text() == text_ && cur.pos() == it->pos) {
// non-editable inset, set cursor after the inset if x is
// nearer to that position (bug 9628)
- CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
- Dimension const & dim = insetCache.dim(inset);
- Point p = insetCache.xy(inset);
- bool const is_rtl = text_->isRTL(text_->getPar(pit));
- if (is_rtl) {
- // "in front of" == "right of"
- if (abs(p.x_ - x) < abs(p.x_ + dim.wid - x))
- cur.posForward();
- } else {
- // "in front of" == "left of"
- if (abs(p.x_ + dim.wid - x) < abs(p.x_ - x))
- cur.posForward();
- }
+ bool bound = false; // is modified by getPosNearX
+ cur.pos() = getPosNearX(row, x, bound);
+ cur.boundary(bound);
+ cur.setCurrentFont();
+ cur.setTargetX(x);
}
if (cur.top().text() == text_)
LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << " pit: " << pit);
- InsetList::const_iterator iit = par.insetList().begin();
- InsetList::const_iterator iend = par.insetList().end();
- for (; iit != iend; ++iit) {
- Inset * inset = iit->inset;
-
- LYXERR(Debug::DEBUG, "examining inset " << inset);
+ for (auto const & it : par.insetList()) {
+ LYXERR(Debug::DEBUG, "examining inset " << it.inset);
- if (!insetCache.has(inset)) {
- LYXERR(Debug::DEBUG, "inset has no cached position");
- return 0;
- }
-
- Dimension const & dim = insetCache.dim(inset);
- Point p = insetCache.xy(inset);
-
- LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid
- << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des);
-
- if (x >= p.x_ && x <= p.x_ + dim.wid
- && y >= p.y_ - dim.asc && y <= p.y_ + dim.des) {
- LYXERR(Debug::DEBUG, "Hit inset: " << inset);
- return const_cast<InsetList::InsetTable *>(&(*iit));
+ if (insetCache.covers(it.inset, x, y)) {
+ LYXERR(Debug::DEBUG, "Hit inset: " << it.inset);
+ return const_cast<InsetList::InsetTable *>(&it);
}
}
}
-Row::const_iterator const
-TextMetrics::findRowElement(Row const & row, pos_type const pos,
- bool const boundary, double & x) const
-{
- /**
- * When boundary is true, position i is in the row element (pos, endpos)
- * if
- * pos < i <= endpos
- * whereas, when boundary is false, the test is
- * pos <= i < endpos
- * The correction below allows to handle both cases.
- */
- int const boundary_corr = (boundary && pos) ? -1 : 0;
-
- x = row.left_margin;
-
- /** Early return in trivial cases
- * 1) the row is empty
- * 2) the position is the left-most position of the row; there
- * is a quirk here however: if the first element is virtual
- * (end-of-par marker for example), then we have to look
- * closer
- */
- if (row.empty()
- || (pos == row.begin()->left_pos() && !boundary
- && !row.begin()->isVirtual()))
- return row.begin();
-
- Row::const_iterator cit = row.begin();
- for ( ; cit != row.end() ; ++cit) {
- /** Look whether the cursor is inside the element's
- * span. Note that it is necessary to take the
- * boundary into account, and to accept virtual
- * elements, which have pos == endpos.
- */
- if (pos + boundary_corr >= cit->pos
- && (pos + boundary_corr < cit->endpos || cit->isVirtual())) {
- x += cit->pos2x(pos);
- break;
- }
- x += cit->full_width();
- }
-
- if (cit == row.end())
- --cit;
-
- return cit;
-}
-
-
int TextMetrics::cursorX(CursorSlice const & sl,
bool boundary) const
{
pos_type const pos = sl.pos();
double x = 0;
- findRowElement(row, pos, boundary, x);
+ row.findElement(pos, boundary, x);
return int(x);
}
int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
{
//lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
- ParagraphMetrics const & pm = par_metrics_[sl.pit()];
+ ParagraphMetrics const & pm = parMetrics(sl.pit());
if (pm.rows().empty())
return 0;
int h = 0;
- h -= par_metrics_[0].rows()[0].ascent();
+ h -= parMetrics(0).rows()[0].ascent();
for (pit_type pit = 0; pit < sl.pit(); ++pit) {
- h += par_metrics_[pit].height();
+ h += parMetrics(pit).height();
}
int pos = sl.pos();
if (pos && boundary)
if (!cur.selection())
text_->deleteWordForward(cur);
else
- cap::cutSelection(cur, true, false);
+ cap::cutSelection(cur, false);
cur.checkBufferStructure();
}
}
}
-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 l_margin = 0;
- if (text_->isMainText())
+ if (text_->isMainText()) {
l_margin += bv_->leftMargin();
-
- l_margin += bfm.signedWidth(tclass.leftmargin());
+ l_margin += bfm.signedWidth(tclass.leftmargin());
+ }
int depth = par.getDepth();
if (depth != 0) {
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;
-
- if (par.params().align() == LYX_ALIGN_LAYOUT)
- align = layout.align;
- else
- align = par.params().align();
+ LyXAlignment align = par.getAlign(bv_->buffer().params());
// set the correct parindent
if (pos == 0
&& (layout.labeltype == LABEL_NO_LABEL
- || layout.labeltype == LABEL_ABOVE
- || layout.labeltype == LABEL_CENTERED
- || (layout.labeltype == LABEL_STATIC
- && layout.latextype == LATEX_ENVIRONMENT
- && !text_->isFirstInSequence(pit)))
+ || layout.labeltype == LABEL_ABOVE
+ || layout.labeltype == LABEL_CENTERED
+ || (layout.labeltype == LABEL_STATIC
+ && layout.latextype == LATEX_ENVIRONMENT
+ && !text_->isFirstInSequence(pit)))
&& (align == LYX_ALIGN_BLOCK || align == LYX_ALIGN_LEFT)
&& !par.params().noindent()
// in some insets, paragraphs are never indented
&& !text_->inset().neverIndent()
// display style insets are always centered, omit indentation
&& !(!par.empty()
- && par.isInset(pos)
- && par.getInset(pos)->display())
+ && par.isInset(pos)
+ && par.getInset(pos)->display())
&& (!(tclass.isDefaultLayout(par.layout())
- || tclass.isPlainLayout(par.layout()))
+ || tclass.isPlainLayout(par.layout()))
|| buffer.params().paragraph_separation
== BufferParams::ParagraphIndentSeparation)) {
- // use the parindent of the layout when the
- // default indentation is used otherwise use
- // the indentation set in the document
- // settings
- if (buffer.params().getIndentation().asLyXCommand() == "default")
- l_margin += bfm.signedWidth(parindent);
- else
- l_margin += buffer.params().getIndentation().inPixels(*bv_);
- }
+ /* use the parindent of the layout when the default
+ * indentation is used otherwise use the indentation set in
+ * the document settings
+ */
+ if (buffer.params().getParIndent().empty())
+ l_margin += bfm.signedWidth(parindent);
+ else
+ l_margin += buffer.params().getParIndent().inPixels(max_width_, bfm.em());
+ }
return l_margin;
}
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];
return;
}
- BufferParams const & bparams = bv_->buffer().params();
int const ww = bv_->workHeight();
Cursor const & cur = bv_->cursor();
DocIterator sel_beg = cur.selectionBegin();
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;
}
// whether this row is the first or last and update the margins.
if (row.selection()) {
if (row.sel_beg == 0)
- row.begin_margin_sel = sel_beg.pit() < pit;
+ row.change(row.begin_margin_sel, sel_beg.pit() < pit);
if (row.sel_end == sel_end_par.lastpos())
- row.end_margin_sel = sel_end.pit() > pit;
+ row.change(row.end_margin_sel, sel_end.pit() > pit);
}
- // Row signature; has row changed since last paint?
- row.setCrc(pm.computeRowSignature(row, bparams));
+ // has row changed since last paint?
bool row_has_changed = row.changed()
|| bv_->hadHorizScrollOffset(text_, pit, row.pos());
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) {
// Paint only the insets if the text itself is
// unchanged.
rp.paintOnlyInsets();
+ row.changed(false);
y += row.descent();
continue;
}
LYXERR(Debug::PAINTING, "Clear rect@("
<< max(row_x, 0) << ", " << y - row.ascent() << ")="
<< width() << " x " << row.height());
+ // FIXME: this is a hack. We clear an amount equal to
+ // cursor width. This will not work if the caret has a
+ // ridiculous width like 6. (see ticket #10797)
+ // This is the same formula as in GuiWorkArea.
+ int const caret_width = lyxrc.cursor_width
+ ? lyxrc.cursor_width
+ : 1 + int((lyxrc.currentZoom + 50) / 200.0);
pi.pain.fillRectangle(max(row_x, 0), y - row.ascent(),
- width(), row.height(), pi.background_color);
+ width() + caret_width,
+ row.height(), pi.background_color);
}
// 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=" << row.selection()
- << " full_repaint=" << pi.full_repaint
- << " row_has_changed=" << row_has_changed
- << " drawingEnabled=" << pi.pain.isDrawingEnabled());
+ && (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": "")
+ << (pi.full_repaint ? " full_repaint" : "")
+ << (row_has_changed ? " row_has_changed" : ""));
}
// Backup full_repaint status and force full repaint
rp.paintSelection();
rp.paintAppendix();
rp.paintDepthBar();
- rp.paintChangeBar();
- bool const is_rtl = text_->isRTL(text_->getPar(pit));
- if (i == 0 && !is_rtl)
+ if (row.needsChangeBar())
+ rp.paintChangeBar();
+ if (i == 0 && !row.isRTL())
rp.paintFirst();
- if (i == nrows - 1 && is_rtl)
+ if (i == nrows - 1 && row.isRTL())
rp.paintLast();
rp.paintText();
- if (i == nrows - 1 && !is_rtl)
+ if (i == nrows - 1 && !row.isRTL())
rp.paintLast();
- if (i == 0 && is_rtl)
+ if (i == 0 && row.isRTL())
rp.paintFirst();
rp.paintTooLargeMarks(row_x + row.left_x() < 0,
row_x + row.right_x() > bv_->workWidth());
y += row.descent();
+#if 0
+ // This debug code shows on screen which rows are repainted.
+ // FIXME: since the updates related to caret blinking restrict
+ // the painter to a small rectangle, the numbers are not
+ // updated when this happens. Change the code in
+ // GuiWorkArea::Private::show/hideCaret if this is important.
+ static int count = 0;
+ ++count;
+ FontInfo fi(sane_font);
+ fi.setSize(FONT_SIZE_TINY);
+ fi.setColor(Color_red);
+ pi.pain.text(row_x, y, convert<docstring>(count), fi);
+#endif
+
// Restore full_repaint status.
pi.full_repaint = tmp;
+
+ row.changed(false);
}
- // Re-enable screen drawing for future use of the painter.
- pi.pain.setDrawingEnabled(true);
//LYXERR(Debug::PAINTING, ".");
}
projects / lyx.git / blobdiff