X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.cpp;h=080ef43f648a82ebfda240eee0e8f1da57d998d5;hb=77713af55868140483a1a7f5704dd93b97dbe116;hp=0fcf02d929b60c30fb4fb24ea94f0dda94fe85c2;hpb=4fb23cc2177e677f2c7f4e501f6aee71e4694228;p=lyx.git

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 0fcf02d929..080ef43f64 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -75,7 +75,11 @@ RowPainter::RowPainter(PainterInfo & pi,
 
 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;
 }
 
 
@@ -227,6 +231,10 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 	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
 	for (++vpos ; vpos < end ; ++vpos) {
@@ -239,6 +247,12 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 			// 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.
@@ -328,14 +342,18 @@ void RowPainter::paintForeignMark(double orig_x, Language const * lang,
 }
 
 
-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.line(int(orig_x), y, int(x_), y, Color_red, Painter::line_onoffdash, 0.5);
+	// 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);
@@ -350,6 +368,10 @@ void RowPainter::paintFromPos(pos_type & vpos)
 	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))
@@ -363,8 +385,9 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
 	paintForeignMark(orig_x, orig_font.language());
 
-	if (lyxrc.spellcheck_continuously && orig_font.isMisspelled())
-		paintMisspelledMark(orig_x, 2);
+	if (lyxrc.spellcheck_continuously && misspelled_) {
+		paintMisspelledMark(orig_x, 2, changed);
+	}
 }
 
 
@@ -865,7 +888,7 @@ void RowPainter::paintText()
 
 		} else {
 			// paint as many characters as possible.
-			paintFromPos(vpos);
+			paintFromPos(vpos, change_running.changed());
 		}
 
 		// Is the inline completion after character?