Fix functions that used functions but did not defined it

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 4f5593e18b3764bce121ea2dae5255888fedc052..e84343a7aa6ada4193a6317322e4dca9a9544da6 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();
@@ -312,8 +313,8 @@ void RowPainter::paintAppendix() const
        if (par_.params().startOfAppendix())
                y += 2 * defaultRowHeight();
 
-       pi_.pain.line(1, y, 1, yo_ + row_.height(), Color_appendix);
-       pi_.pain.line(tm_.width() - 2, y, tm_.width() - 2, yo_ + row_.height(), Color_appendix);
+       pi_.pain.line(1, y, 1, yo_ + row_.descent(), Color_appendix);
+       pi_.pain.line(tm_.width() - 2, y, tm_.width() - 2, yo_ + row_.descent(), Color_appendix);
 }
 
 
@@ -351,12 +352,12 @@ void RowPainter::paintDepthBar() const
                int const starty = yo_ - row_.ascent();
                int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;
 
-               pi_.pain.line(x, starty, x, starty + h, Color_depthbar);
+               pi_.pain.line(x, starty + (i > prev_depth ? 1 : 0), x, starty + h, Color_depthbar);
 
                if (i > prev_depth)
                        pi_.pain.fillRectangle(x, starty, w, 2, Color_depthbar);
                if (i > next_depth)
-                       pi_.pain.fillRectangle(x, starty + h, w, 2, Color_depthbar);
+                       pi_.pain.fillRectangle(x, starty + h - 1, w, 2, Color_depthbar);
        }
 }