X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.cpp;h=a88ac2a6be39bd7a8bd2794aee1f9fdf6b2aaf6f;hb=55012674c87bae73da86b64148427b0e6e3c58f4;hp=85f450edc6f7f7718d3025056810c2a410831e8f;hpb=4858bb3bb68aac142815b530a017e3776d1c7c11;p=lyx.git

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 85f450edc6..a88ac2a6be 100644
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -73,11 +73,12 @@ RowPainter::RowPainter(PainterInfo & pi,
 }
 
 
-FontInfo RowPainter::labelFont() const
+FontInfo RowPainter::labelFont(bool end) const
 {
 	FontInfo f = text_.labelFont(par_);
 	// selected text?
-	if (row_.begin_margin_sel || pi_.selected)
+	if ((end ? row_.end_margin_sel : row_.begin_margin_sel)
+	    || pi_.selected)
 		f.setPaintColor(Color_selectiontext);
 	return f;
 }
@@ -138,6 +139,13 @@ void RowPainter::paintInset(Row::Element const & e) const
 }
 
 
+void RowPainter::paintLanguageMarkings(Row::Element const & e) const
+{
+	paintForeignMark(e);
+	paintNoSpellingMark(e);
+}
+
+
 void RowPainter::paintForeignMark(Row::Element const & e) const
 {
 	Language const * lang = e.font.language();
@@ -149,15 +157,38 @@ void RowPainter::paintForeignMark(Row::Element const & e) const
 		return;
 
 	int const desc = e.inset ? e.dim.descent() : 0;
-	int const y = yo_ + pi_.base.solidLineOffset()
-		+ desc + pi_.base.solidLineThickness() / 2;
-	pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
+	int const y = yo_ + min(3 * pi_.base.solidLineOffset() / 2 + desc,
+	                        row_.descent() - 1);
+	pi_.pain.line(int(x_), y, int(x_ + e.full_width() - 1), y, Color_language,
 	              Painter::line_solid, pi_.base.solidLineThickness());
 }
 
 
+void RowPainter::paintNoSpellingMark(Row::Element const & e) const
+{
+	//if (!lyxrc.mark_no_spelling)
+	//	return;
+	if (e.font.language() == latex_language)
+		return;
+	if (e.font.fontInfo().nospellcheck() != FONT_ON)
+		return;
+
+	// We at the same voffset than the misspelled mark, since
+	// these two are mutually exclusive
+	int const desc = e.inset ? e.dim.descent() : 0;
+	int const y = yo_ + pi_.base.solidLineOffset() + desc
+		+ pi_.base.solidLineThickness()
+		+ (e.change.changed() ? pi_.base.solidLineThickness() + 1 : 0)
+		+ 1;
+	pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
+		      Painter::line_onoffdash, pi_.base.solidLineThickness());
+}
+
+
 void RowPainter::paintMisspelledMark(Row::Element const & e) const
 {
+	if (e.font.fontInfo().nospellcheck() == FONT_ON)
+		return;
 	// if changed the misspelled marker gets placed slightly lower than normal
 	// to avoid drawing at the same vertical offset
 	FontMetrics const & fm = theFontMetrics(e.font);
@@ -196,7 +227,6 @@ void RowPainter::paintMisspelledMark(Row::Element const & e) const
 			continue;
 		}
 
-		FontMetrics const & fm = theFontMetrics(e.font);
 		int x1 = fm.pos2x(e.str, range.first - e.pos,
 		                  e.isRTL(), e.extra);
 		int x2 = fm.pos2x(e.str, min(range.last - e.pos + 1,
@@ -239,6 +269,21 @@ void RowPainter::paintStringAndSel(Row::Element const & e) const
 }
 
 
+void RowPainter::paintTextDecoration(Row::Element const & e) const
+{
+	// element selected?
+	bool const sel = (e.pos >= row_.sel_beg && e.endpos <= row_.sel_end)
+		|| pi_.selected;
+	FontInfo copy = e.font.fontInfo();
+	if (sel || e.change.changed()) {
+		Color const col = e.change.changed() ? e.change.color()
+		                                     : Color_selectiontext;
+		copy.setPaintColor(col);
+	}
+	pi_.pain.textDecoration(copy, int(x_), yo_, int(e.full_width()));
+}
+
+
 void RowPainter::paintChange(Row::Element const & e) const
 {
 	e.change.paintCue(pi_, x_, yo_, x_ + e.full_width(), e.font.fontInfo());
@@ -297,9 +342,9 @@ void RowPainter::paintDepthBar() const
 	for (depth_type i = 1; i <= depth; ++i) {
 		int const w = nestMargin() / 5;
 		int x = int(xo_) + w * i;
-		// only consider the changebar space if we're drawing outermost text
+		// consider the bufferview left margin if we're drawing outermost text
 		if (text_.isMainText())
-			x += changebarMargin();
+			x += pi_.base.bv->leftMargin();
 
 		int const starty = yo_ - row_.ascent();
 		int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;
@@ -382,16 +427,12 @@ void RowPainter::paintLabel() const
 		return;
 
 	Layout const & layout = par_.layout();
-	FontInfo const font = labelFont();
+	FontInfo const font = labelFont(false);
 	FontMetrics const & fm = theFontMetrics(font);
-	double x = x_;
-
-	if (row_.isRTL())
-		x = tm_.width() - row_.right_margin + fm.width(layout.labelsep);
-	else
-		x = x_ - fm.width(layout.labelsep) - fm.width(str);
+	int const x = row_.isRTL() ? row_.width() + fm.width(layout.labelsep)
+	                           : row_.left_margin - fm.width(layout.labelsep) - fm.width(str);
 
-	pi_.pain.text(int(x), yo_, str, font);
+	pi_.pain.text(int(xo_) + x, yo_, str, font);
 }
 
 
@@ -400,7 +441,7 @@ void RowPainter::paintTopLevelLabel() const
 	BufferParams const & bparams = pi_.base.bv->buffer().params();
 	ParagraphParameters const & pparams = par_.params();
 	Layout const & layout = par_.layout();
-	FontInfo const font = labelFont();
+	FontInfo const font = labelFont(false);
 	docstring const str = par_.labelString();
 	if (str.empty())
 		return;
@@ -422,10 +463,10 @@ void RowPainter::paintTopLevelLabel() const
 
 	double x = x_;
 	if (layout.labeltype == LABEL_CENTERED) {
-		x = row_.left_margin + (tm_.width() - row_.left_margin - row_.right_margin) / 2;
+		x += (tm_.width() - row_.left_margin - row_.right_margin) / 2;
 		x -= fm.width(str) / 2;
 	} else if (row_.isRTL()) {
-		x = tm_.width() - row_.right_margin - fm.width(str);
+		x = xo_ + tm_.width() - row_.right_margin - fm.width(str);
 	}
 	pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
 }
@@ -466,34 +507,12 @@ static int getEndLabel(pit_type p, Text const & text)
 void RowPainter::paintLast() const
 {
 	int const endlabel = getEndLabel(row_.pit(), text_);
-
-	// paint imaginary end-of-paragraph character
-
-	Change const & change = par_.lookupChange(par_.size());
-	if (change.changed()) {
-		FontMetrics const & fm =
-			theFontMetrics(pi_.base.bv->buffer().params().getFont());
-		int const length = fm.maxAscent() / 2;
-		Color col = change.color();
-
-		pi_.pain.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
-			   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, 3);
-		} else {
-			pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1,
-				yo_ + 2, col, Painter::line_solid, 3);
-		}
-	}
-
-	// draw an endlabel
-
 	switch (endlabel) {
 	case END_LABEL_BOX:
 	case END_LABEL_FILLED_BOX: {
-		FontInfo const font = labelFont();
+		FontInfo font = labelFont(true);
+		if (font.realColor() != Color_selectiontext)
+			font.setPaintColor(Color_eolmarker);
 		FontMetrics const & fm = theFontMetrics(font);
 		int const size = int(0.75 * fm.maxAscent());
 		int const y = yo_ - size;
@@ -510,14 +529,14 @@ void RowPainter::paintLast() const
 		}
 
 		if (endlabel == END_LABEL_BOX)
-			pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
+			pi_.pain.rectangle(int(xo_) + x, y, size, size, font.realColor());
 		else
-			pi_.pain.fillRectangle(x, y, size, size, Color_eolmarker);
+			pi_.pain.fillRectangle(int(xo_) + x, y, size, size, font.realColor());
 		break;
 	}
 
 	case END_LABEL_STATIC: {
-		FontInfo const font = labelFont();
+		FontInfo const font = labelFont(true);
 		FontMetrics const & fm = theFontMetrics(font);
 		docstring const & str = par_.layout().endlabelstring();
 		double const x = row_.isRTL() ? x_ - fm.width(str) : x_;
@@ -533,14 +552,12 @@ void RowPainter::paintLast() const
 
 void RowPainter::paintOnlyInsets()
 {
-	Row::const_iterator cit = row_.begin();
-	Row::const_iterator const & end = row_.end();
-	for ( ; cit != end ; ++cit) {
-		Row::Element const & e = *cit;
+	for (Row::Element const & e : row_) {
 		if (e.type == Row::INSET) {
 			paintInset(e);
-			// The line that indicates word in a different language
-			paintForeignMark(e);
+			// The markings of foreign languages
+			// and of text ignored for spellchecking
+			paintLanguageMarkings(e);
 			// change tracking (not for insets that handle it themselves)
 			if (!e.inset->canPaintChange(*pi_.base.bv))
 				paintChange(e);
@@ -553,11 +570,7 @@ void RowPainter::paintOnlyInsets()
 
 void RowPainter::paintText()
 {
-	Row::const_iterator cit = row_.begin();
-	Row::const_iterator const & end = row_.end();
-	for ( ; cit != end ; ++cit) {
-		Row::Element const & e = *cit;
-
+	for (Row::Element const & e : row_) {
 		switch (e.type) {
 		case Row::STRING:
 		case Row::VIRTUAL:
@@ -570,14 +583,16 @@ void RowPainter::paintText()
 
 		case Row::INSET:
 			paintInset(e);
+			paintTextDecoration(e);
 			break;
 
 		case Row::SPACE:
-			pi_.pain.textDecoration(e.font.fontInfo(), int(x_), yo_, int(e.full_width()));
+			paintTextDecoration(e);
 		}
 
-		// The line that indicates word in a different language
-		paintForeignMark(e);
+		// The markings of foreign languages
+		// and of text ignored for spellchecking
+		paintLanguageMarkings(e);
 
 		// change tracking (not for insets that handle it themselves)
 		if (e.type != Row::INSET || ! e.inset->canPaintChange(*pi_.base.bv))