X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.cpp;h=4f5593e18b3764bce121ea2dae5255888fedc052;hb=9350076b3aa268919a4bf6e05c4a10caebabb913;hp=656f89a4e0dbac12f5fffe9e2fd5c08cf7155329;hpb=a558f78aa547b3a1a052faafccfad4e9b5afc767;p=features.git

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 656f89a4e0..4f5593e18b 100644
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -18,6 +18,7 @@
 #include "Cursor.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "Bullet.h"
 #include "Changes.h"
 #include "Language.h"
 #include "Layout.h"
@@ -343,9 +344,9 @@ void RowPainter::paintDepthBar() const
 	for (depth_type i = 1; i <= depth; ++i) {
 		int const w = nestMargin() / 5;
 		int x = int(xo_) + w * i;
-		// consider the bufferview left margin if we're drawing outermost text
+		// only consider the changebar space if we're drawing outermost text
 		if (text_.isMainText())
-			x += pi_.base.bv->leftMargin();
+			x += pi_.base.bv->leftMargin() - changebarMargin();
 
 		int const starty = yo_ - row_.ascent();
 		int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;
@@ -426,13 +427,26 @@ void RowPainter::paintLabel() const
 	if (str.empty())
 		return;
 
+	// different font for label separation and string
 	Layout const & layout = par_.layout();
 	FontInfo const font = labelFont(false);
 	FontMetrics const & fm = theFontMetrics(font);
+	FontInfo lfont = font;
+
+	// bullet?
+	if (layout.labeltype == LABEL_ITEMIZE && par_.itemdepth < 4) {
+		// get label font size from document properties
+		lfont.setSize(pi_.base.bv->buffer().params().user_defined_bullet(par_.itemdepth).getFontSize());
+		// realize to avoid assertion
+		lfont.realize(sane_font);
+	}
+
+	FontMetrics const & lfm = theFontMetrics(lfont);
+
 	int const x = row_.isRTL() ? row_.width() + fm.width(layout.labelsep)
-	                           : row_.left_margin - fm.width(layout.labelsep) - fm.width(str);
+	                           : row_.left_margin - fm.width(layout.labelsep) - lfm.width(str);
 
-	pi_.pain.text(int(xo_) + x, yo_, str, font);
+	pi_.pain.text(int(xo_) + x, yo_, str, lfont);
 }
 
 
@@ -564,11 +578,8 @@ void RowPainter::paintText()
 			break;
 
 		case Row::SPACE:
+		case Row::MARGINSPACE:
 			paintTextDecoration(e);
-			break;
-
-		case Row::INVALID:
-			LYXERR0("Trying to paint INVALID row element.");
 		}
 
 		// The markings of foreign languages
@@ -589,12 +600,16 @@ void RowPainter::paintSelection() const
 	if (!row_.selection())
 		return;
 
-	int const y1 = yo_ - (row_.begin_margin_sel ? row_.ascent()
-	                                            : row_.contents_dim().asc);
-	int const y2 = yo_ + (row_.end_margin_sel ? row_.descent()
-	                                          : row_.contents_dim().des);
+	int const y1 = yo_ - row_.contents_dim().asc;
+	int const y2 = yo_ + row_.contents_dim().des;
+
+	// The top selection
+	if (row_.begin_margin_sel)
+		pi_.pain.fillRectangle(int(xo_), yo_ - row_.ascent(),
+		                       tm_.width(), row_.ascent() - row_.contents_dim().asc,
+		                       Color_selection);
 
-	// draw the margins
+	// The left margin selection
 	if (row_.isRTL() ? row_.end_margin_sel : row_.begin_margin_sel)
 		pi_.pain.fillRectangle(int(xo_), y1, row_.left_margin, y2 - y1,
 		                       Color_selection);
@@ -633,10 +648,16 @@ void RowPainter::paintSelection() const
 		x += e.full_width();
 	}
 
+	// the right margin selection
 	if (row_.isRTL() ? row_.begin_margin_sel : row_.end_margin_sel)
 		pi_.pain.fillRectangle(int(x), y1,
 		                       int(xo_ + tm_.width()) - int(x), y2 - y1,
 		                       Color_selection);
+	// The bottom selection
+	if (row_.end_margin_sel)
+		pi_.pain.fillRectangle(int(xo_), yo_ + row_.contents_dim().des,
+		                       tm_.width(), row_.descent() - row_.contents_dim().des,
+		                       Color_selection);
 }