Amend 207eaeee9071cb

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 84848ec05a25521fa9634613e2cbd85839b90e43..77e0ff67e61a005f33a11e7b21c43bf735733226 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -67,7 +67,7 @@ RowPainter::RowPainter(PainterInfo & pi,
 
 FontInfo RowPainter::labelFont(bool end) const
 {
-       FontInfo f = text_.labelFont(par_);
+       FontInfo f = tm_.labelDisplayFont(row_.pit()).fontInfo();
        // selected text?
        if ((end ? row_.end_margin_sel : row_.begin_margin_sel)
            || pi_.selected)
@@ -103,6 +103,7 @@ void RowPainter::paintInset(Row::Element const & e) const
 
        pi_.base.font = e.inset->inheritFont() ? e.font.fontInfo() :
                pi_.base.bv->buffer().params().getFont().fontInfo();
+       pi_.base.outer_font = e.font.fontInfo();
        pi_.ltr_pos = !e.font.isVisibleRightToLeft();
        pi_.change = pi_.change.changed() ? pi_.change : e.change;
        pi_.do_spellcheck &= e.inset->allowSpellCheck();
@@ -434,7 +435,7 @@ void RowPainter::paintLabel() const
        FontInfo lfont = font;
 
        // bullet?
-       if (layout.labeltype == LABEL_ITEMIZE) {
+       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