FontInfo RowPainter::labelFont() const
{
- return text_.labelFont(par_);
+ FontInfo f = text_.labelFont(par_);
+ // selected text?
+ if (row_.begin_margin_sel || pi_.selected)
+ f.setPaintColor(Color_selectiontext);
+ return f;
}
Change const & change_running = par_.lookupChange(pos);
// selected text?
- bool const selection = pos >= row_.sel_beg && pos < row_.sel_end;
+ bool const selection = (pos >= row_.sel_beg && pos < row_.sel_end)
+ || pi_.selected;
+
+ // spelling correct?
+ bool const spell_state =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
char_type prev_char = ' ';
// collect as much similar chars as we can
// Selection ends or starts here.
break;
+ bool const new_spell_state =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
+ if (new_spell_state != spell_state)
+ // Spell checker state changed here.
+ break;
+
Change const & change = par_.lookupChange(pos);
if (!change_running.isSimilarTo(change))
// Track change type or author has changed.
}
-void RowPainter::paintMisspelledMark(double orig_x, int desc)
+void RowPainter::paintMisspelledMark(double orig_x, int desc, bool changed)
{
- int const y = yo_ + desc;
- pi_.pain.wavyHorizontalLine(int(orig_x), y, int(x_) - int(orig_x), Color_red);
+ // 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);
}
-void RowPainter::paintFromPos(pos_type & vpos)
+void RowPainter::paintFromPos(pos_type & vpos, bool changed)
{
pos_type const pos = bidi_.vis2log(vpos);
Font const orig_font = text_metrics_.displayFont(pit_, pos);
bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" ||
lang == "farsi";
+ // spelling correct?
+ bool const misspelled_ =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
+
// draw as many chars as we can
if ((!hebrew && !arabic)
|| (hebrew && !Encodings::isHebrewComposeChar(c))
paintForeignMark(orig_x, orig_font.language());
- if (orig_font.isMisspelled())
- paintMisspelledMark(orig_x, 3);
+ if (lyxrc.spellcheck_continuously && misspelled_) {
+ paintMisspelledMark(orig_x, 2, changed);
+ }
}
void RowPainter::paintFirst()
{
- ParagraphParameters const & parparams = par_.params();
+ ParagraphParameters const & pparams = par_.params();
+ Buffer const & buffer = pi_.base.bv->buffer();
+ BufferParams const & bparams = buffer.params();
+ Layout const & layout = par_.layout();
int y_top = 0;
// start of appendix?
- if (parparams.startOfAppendix())
+ if (pparams.startOfAppendix())
y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
- Buffer const & buffer = pi_.base.bv->buffer();
- Layout const & layout = par_.layout();
-
- if (buffer.params().paragraph_separation == BufferParams::ParagraphSkipSeparation) {
- if (pit_ != 0) {
- if (layout.latextype == LATEX_PARAGRAPH
- && !par_.getDepth()) {
- y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
- } else {
- Layout const & playout = pars_[pit_ - 1].layout();
- if (playout.latextype == LATEX_PARAGRAPH
- && !pars_[pit_ - 1].getDepth()) {
- // is it right to use defskip here, too? (AS)
- y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
- }
+ if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
+ && pit_ != 0) {
+ if (layout.latextype == LATEX_PARAGRAPH
+ && !par_.getDepth()) {
+ y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
+ } else {
+ Layout const & playout = pars_[pit_ - 1].layout();
+ if (playout.latextype == LATEX_PARAGRAPH
+ && !pars_[pit_ - 1].getDepth()) {
+ // is it right to use defskip here, too? (AS)
+ y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
}
}
}
// the top.
if (layout.counter == "chapter") {
double spacing_val = 1.0;
- if (!parparams.spacing().isDefault()) {
- spacing_val = parparams.spacing().getValue();
+ if (!pparams.spacing().isDefault()) {
+ spacing_val = pparams.spacing().getValue();
} else {
- spacing_val = buffer.params().spacing().getValue();
+ spacing_val = bparams.spacing().getValue();
}
int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val);
docstring const str = par_.labelString();
if (!str.empty()) {
double spacing_val = 1.0;
- if (!parparams.spacing().isDefault())
- spacing_val = parparams.spacing().getValue();
+ if (!pparams.spacing().isDefault())
+ spacing_val = pparams.spacing().getValue();
else
- spacing_val = buffer.params().spacing().getValue();
+ spacing_val = bparams.spacing().getValue();
FontMetrics const & fm = theFontMetrics(font);
Color col = change.color();
pi_.pain.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
- Painter::line_solid, Painter::line_thick);
+ Painter::line_solid, 3);
if (change.deleted()) {
pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1 + length,
- yo_ + 2, col, Painter::line_solid, Painter::line_thick);
+ yo_ + 2, col, Painter::line_solid, 3);
} else {
pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1,
- yo_ + 2, col, Painter::line_solid, Painter::line_thick);
+ yo_ + 2, col, Painter::line_solid, 3);
}
}
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout().endlabelstring();
- double const x = is_rtl ?
- text_metrics_.width() - row_.width() - fm.width(str) : x_;
+ double const x = is_rtl ? x_ - fm.width(str) : x_;
pi_.pain.text(int(x), yo_, str, font);
break;
}
case END_LABEL_NO_LABEL:
+ if (lyxrc.paragraph_markers && size_type(pit_ + 1) < pars_.size()) {
+ docstring const s = docstring(1, char_type(0x00B6));
+ FontInfo f = FontInfo();
+ FontMetrics const & fm = theFontMetrics(f);
+ f.setColor(Color_paragraphmarker);
+ pi_.pain.text(int(x_), yo_, s, f);
+ x_ += fm.width(s);
+ }
break;
}
}
bool const pi_selected = pi_.selected;
Cursor const & cur = pi_.base.bv->cursor();
if (cur.selection() && cur.text() == &text_
- && cur.anchor().text() == &text_)
+ && cur.normalAnchor().text() == &text_)
pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
paintInset(inset, pos);
pi_.selected = pi_selected;
int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid,
- Painter::line_thin);
+ change_running.color(), Painter::line_solid, 0.5);
// Change might continue with a different author or type
if (change.changed() && !highly_editable_inset) {
bool const pi_selected = pi_.selected;
Cursor const & cur = pi_.base.bv->cursor();
if (cur.selection() && cur.text() == &text_
- && cur.anchor().text() == &text_)
+ && cur.normalAnchor().text() == &text_)
pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
paintInset(inset, pos);
pi_.selected = pi_selected;
} else {
// paint as many characters as possible.
- paintFromPos(vpos);
+ paintFromPos(vpos, change_running.changed());
}
// Is the inline completion after character?
int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, Painter::line_thin);
+ change_running.color(), Painter::line_solid, 0.5);
change_running.setUnchanged();
}
}