Update Win installer for new dictionary links. Untested.

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index c49b5e6b75f38b278a3ba8962e7690d6d73ff623..77e0ff67e61a005f33a11e7b21c43bf735733226 100644 (file)
--- 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"
@@ -66,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)
@@ -102,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();
@@ -343,9 +345,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 +428,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);
 }