#include "insets/InsetText.h"
+#include "mathed/InsetMath.h"
+
#include "support/debug.h"
#include "support/gettext.h"
#include "support/textutils.h"
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
pm_(text_metrics_.parMetrics(pit)),
bidi_(bidi), change_(pi_.change_),
- xo_(x), yo_(y), width_(text_metrics_.width())
+ xo_(x), yo_(y), width_(text_metrics_.width()),
+ line_thickness_(1.0), line_offset_(2)
{
bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
+
+ if (lyxrc.zoom >= 100) {
+ // derive the line thickness from zoom factor
+ // the zoom is given in percent
+ // (increase thickness at 150%, 250% etc.)
+ line_thickness_ = (float)(int((lyxrc.zoom + 50) / 100.0));
+ // adjust line_offset_ too
+ line_offset_ = int(2 * line_thickness_) + 1;
+ }
+
x_ = row_.x + xo_;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
int const x1 = int(x_);
pi_.base.bv->coordCache().insets().add(inset, x1, yo_);
// insets are painted completely. Recursive
+ // FIXME: it is wrong to completely paint the background
+ // if we want to do single row painting.
inset->drawBackground(pi_, x1, yo_);
inset->drawSelection(pi_, x1, yo_);
inset->draw(pi_, x1, yo_);
// This method takes up 70% of time when typing
pos_type pos = bidi_.vis2log(vpos);
// first character
+ char_type prev_char = par_.getChar(pos);
vector<char_type> str;
str.reserve(100);
- str.push_back(par_.getChar(pos));
+ str.push_back(prev_char);
if (arabic) {
char_type c = str[0];
bool const spell_state =
lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
- char_type prev_char = 0;
// collect as much similar chars as we can
for (++vpos ; vpos < end ; ++vpos) {
+ // Work-around bug #6920
+ // The bug can be reproduced with DejaVu font under Linux.
+ // The issue is that we compute the metrics character by character
+ // in ParagraphMetrics::singleWidth(); but we paint word by word
+ // for performance reason.
+ // Maybe a more general fix would be draw character by character
+ // for some predefined fonts on some platform. In arabic and
+ // Hebrew we already do paint this way.
+ if (prev_char == 'f')
+ break;
+
pos = bidi_.vis2log(vpos);
if (pos < font_span.first || pos > font_span.last)
break;
if (!isPrintableNonspace(c))
break;
- // Work-around bug #6920
- // The bug can be reproduced with DejaVu font under Linux.
- // The issue is that we compute the metrics character by character
- // in ParagraphMetrics::singleWidth(); but we paint word by word
- // for performance reason.
- // Maybe a more general fix would be draw character by character
- // for some predefined fonts on some platform. In arabic and
- // Hebrew we already do paint this way.
- if (prev_char == 'f')
- break;
-
/* Because we do our own bidi, at this point the strings are
* already in visual order. However, Qt also applies its own
* bidi algorithm to strings that it paints to the screen.
if (lang == pi_.base.bv->buffer().params().language)
return;
- int const y = yo_ + 1 + desc;
- pi_.pain.line(int(orig_x), y, int(x_), y, Color_language);
+ int const y = yo_ + 1 + desc + int(line_thickness_/2);
+ pi_.pain.line(int(orig_x), y, int(x_), y, Color_language,
+ Painter::line_solid, line_thickness_);
}
-void RowPainter::paintMisspelledMark(double orig_x, int desc, bool changed)
+void RowPainter::paintMisspelledMark(double orig_x, bool changed)
{
- // derive the offset from zoom factor specified by user in percent
// if changed the misspelled marker gets placed slightly lower than normal
// to avoid drawing at the same vertical offset
- int const offset = int(1.5 * lyxrc.zoom / 100.0); // [percent]
- int const y = yo_ + desc + (changed ? offset : 0);
- pi_.pain.line(int(orig_x), y, int(x_), y, Color_red, Painter::line_onoffdash, 1.0);
+ int const y = yo_ + (changed ? int(line_thickness_ + 1.0) : 0) + line_offset_;
+ pi_.pain.line(int(orig_x), y, int(x_), y, Color_error,
+ Painter::line_onoffdash, line_thickness_);
}
lang == "farsi";
// spelling correct?
- bool const misspelled_ =
+ bool const misspelled =
lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
// draw as many chars as we can
paintForeignMark(orig_x, orig_font.language());
- if (lyxrc.spellcheck_continuously && misspelled_) {
- paintMisspelledMark(orig_x, 2, changed);
+ if (lyxrc.spellcheck_continuously && misspelled) {
+ // check for cursor position
+ // don't draw misspelled marker for words at cursor position
+ // we don't want to disturb the process of text editing
+ BufferView const * bv = pi_.base.bv;
+ DocIterator const nw = bv->cursor().newWord();
+ bool new_word = false;
+ if (!nw.empty() && par_.id() == nw.paragraph().id()) {
+ pos_type cpos = nw.pos();
+ if (cpos > 0 && cpos == par_.size() && !par_.isWordSeparator(cpos-1))
+ --cpos;
+ else if (cpos > 0 && par_.isWordSeparator(cpos))
+ --cpos;
+ new_word = par_.isSameSpellRange(pos, cpos) ;
+ }
+ if (!new_word)
+ paintMisspelledMark(orig_x, changed);
}
}
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);
- if (!inset)
+ 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))
FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const y_bar = change_running.deleted() ?
- yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
+ yo_ - fm.maxAscent() / 3 : yo_ + line_offset_;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, 0.5);
+ change_running.color(), Painter::line_solid, line_thickness_);
// Change might continue with a different author or type
if (change.changed() && !highly_editable_inset) {
FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const y_bar = change_running.deleted() ?
- yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
+ yo_ - fm.maxAscent() / 3 : yo_ + line_offset_;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, 0.5);
+ change_running.color(), Painter::line_solid, line_thickness_);
change_running.setUnchanged();
}
}
+void RowPainter::paintSelection()
+{
+ if (!row_.selection())
+ return;
+ Cursor const & curs = pi_.base.bv->cursor();
+ DocIterator beg = curs.selectionBegin();
+ beg.pit() = pit_;
+ beg.pos() = row_.sel_beg;
+
+ DocIterator end = curs.selectionEnd();
+ end.pit() = pit_;
+ end.pos() = row_.sel_end;
+
+ bool const begin_boundary = beg.pos() >= row_.endpos();
+ bool const end_boundary = row_.sel_end == row_.endpos();
+
+ DocIterator cur = beg;
+ cur.boundary(begin_boundary);
+ int x1 = text_metrics_.cursorX(beg.top(), begin_boundary);
+ int x2 = text_metrics_.cursorX(end.top(), end_boundary);
+ int const y1 = yo_ - row_.ascent();
+ int const y2 = y1 + row_.height();
+
+ int const rm = text_.isMainText() ? pi_.base.bv->rightMargin() : 0;
+ int const lm = text_.isMainText() ? pi_.base.bv->leftMargin() : 0;
+
+ // draw the margins
+ if (row_.begin_margin_sel) {
+ if (text_.isRTL(beg.paragraph())) {
+ pi_.pain.fillRectangle(int(xo_ + x1), y1,
+ text_metrics_.width() - rm - x1, y2 - y1, Color_selection);
+ } else {
+ pi_.pain.fillRectangle(int(xo_ + lm), y1, x1 - lm, y2 - y1,
+ Color_selection);
+ }
+ }
+
+ if (row_.end_margin_sel) {
+ if (text_.isRTL(beg.paragraph())) {
+ pi_.pain.fillRectangle(int(xo_ + lm), y1, x2 - lm, y2 - y1,
+ Color_selection);
+ } else {
+ pi_.pain.fillRectangle(int(xo_ + x2), y1, text_metrics_.width() - rm - x2,
+ y2 - y1, Color_selection);
+ }
+ }
+
+ // if we are on a boundary from the beginning, it's probably
+ // a RTL boundary and we jump to the other side directly as this
+ // segement is 0-size and confuses the logic below
+ if (cur.boundary())
+ cur.boundary(false);
+
+ // go through row and draw from RTL boundary to RTL boundary
+ while (cur < end) {
+ bool draw_now = false;
+
+ // simplified cursorForward code below which does not
+ // descend into insets and which does not go into the
+ // next line. Compare the logic with the original cursorForward
+
+ // if left of boundary -> just jump to right side, but
+ // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
+ if (cur.boundary()) {
+ cur.boundary(false);
+ } else if (text_metrics_.isRTLBoundary(cur.pit(), cur.pos() + 1)) {
+ // in front of RTL boundary -> Stay on this side of the boundary
+ // because: ab|cDDEEFFghi -> abc|DDEEFFghi
+ ++cur.pos();
+ cur.boundary(true);
+ draw_now = true;
+ } else {
+ // move right
+ ++cur.pos();
+
+ // line end?
+ if (cur.pos() == row_.endpos())
+ cur.boundary(true);
+ }
+
+ if (x1 == -1) {
+ // the previous segment was just drawn, now the next starts
+ x1 = text_metrics_.cursorX(cur.top(), cur.boundary());
+ }
+
+ if (!(cur < end) || draw_now) {
+ x2 = text_metrics_.cursorX(cur.top(), cur.boundary());
+ pi_.pain.fillRectangle(int(xo_ + min(x1, x2)), y1, abs(x2 - x1),
+ y2 - y1, Color_selection);
+
+ // reset x1, so it is set again next round (which will be on the
+ // right side of a boundary or at the selection end)
+ x1 = -1;
+ }
+ }
+}
+
+
void RowPainter::paintInlineCompletion(Font const & font)
{
docstring completion = pi_.base.bv->inlineCompletion();
projects / lyx.git / blobdiff