X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.cpp;h=4f5593e18b3764bce121ea2dae5255888fedc052;hb=61d68d05bd0f2172ab9406f23dc2640e6b9ac56b;hp=cffdcf26692ff097f59d5e4600ccce184b746de6;hpb=a64244b844e613aa0f739e050aa23168ff21fce9;p=features.git

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index cffdcf2669..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"
@@ -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);
 }