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 6798d917ecc7b9d6acf6482d37bb2c78c3162127..e84343a7aa6ada4193a6317322e4dca9a9544da6 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -100,14 +100,13 @@ void RowPainter::paintInset(Row::Element const & e) const
        bool const pi_full_repaint = pi_.full_repaint;
        bool const pi_do_spellcheck = pi_.do_spellcheck;
        Change const pi_change = pi_.change;
-       int const pi_textwidth = pi_.base.textwidth;
 
        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();
-       pi_.base.textwidth += e.extra;
 
        int const x1 = int(x_);
        pi_.base.bv->coordCache().insets().add(e.inset, x1, yo_);
@@ -124,7 +123,6 @@ void RowPainter::paintInset(Row::Element const & e) const
        pi_.change = pi_change;
        pi_.do_spellcheck = pi_do_spellcheck;
        pi_.selected = pi_selected;
-       pi_.base.textwidth = pi_textwidth;
 
 #ifdef DEBUG_METRICS
        Dimension const & dim = pi_.base.bv->coordCache().insets().dim(e.inset);
@@ -315,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);
 }
 
 
@@ -354,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);
        }
 }
 
@@ -558,8 +556,7 @@ void RowPainter::paintOnlyInsets()
                                paintChange(e);
                }
 
-               // extra is the extrawidth band-aid described in redoParagraphs
-               x_ +=  e.full_width() + ((e.type == Row::INSET) ? e.extra : 0);
+               x_ += e.full_width();
        }
 }
 
@@ -594,8 +591,7 @@ void RowPainter::paintText()
                if (e.type != Row::INSET || ! e.inset->canPaintChange(*pi_.base.bv))
                        paintChange(e);
 
-               // extra is the extrawidth band-aid described in redoParagraphs
-               x_ +=  e.full_width() + ((e.type == Row::INSET) ? e.extra : 0);
+               x_ += e.full_width();
        }
 }