Disable setting vertical lines when using a formal table

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 2a25482b34409d5179f9634cf54a0d970be5374c..ce5780bb4c65b8bf4c7031c04b380ce80cae4503 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -139,7 +139,7 @@ void RowPainter::paintInset(Inset const * inset, Font const & font,
        inset->drawSelection(pi_, x1, yo_);
        inset->draw(pi_, x1, yo_);
 
-       Dimension const & dim = pm_.insetDimension(inset);
+       Dimension const & dim = pi_.base.bv->coordCache().insets().dim(inset);
 
        paintForeignMark(x_, font.language(), dim.descent());
 
@@ -219,10 +219,10 @@ void RowPainter::paintMisspelledMark(double const orig_x,
 
                FontMetrics const & fm = theFontMetrics(e.font);
                int x1 = fm.pos2x(e.str, range.first - e.pos,
-                                 e.font.isVisibleRightToLeft(), e.extra);
+                                 e.isRTL(), e.extra);
                int x2 = fm.pos2x(e.str, min(range.last - e.pos + 1,
                                                                         pos_type(e.str.length())),
-                                                                        e.font.isVisibleRightToLeft(), e.extra);
+                                                                        e.isRTL(), e.extra);
                if (x1 > x2)
                        swap(x1, x2);
 
@@ -243,13 +243,11 @@ void RowPainter::paintStringAndSel(Row::Element const & e)
        bool const all_sel = (e.pos >= row_.sel_beg && e.endpos < row_.sel_end)
                || pi_.selected;
 
-       if (all_sel) {
+       if (all_sel || e.change.changed()) {
                Font copy = e.font;
-               copy.fontInfo().setPaintColor(Color_selectiontext);
-               pi_.pain.text(int(x_), yo_, e.str, copy, e.extra);
-       } else if (e.change.changed()) {
-               Font copy = e.font;
-               copy.fontInfo().setPaintColor(e.change.color());
+               Color const col = e.change.changed() ? e.change.color()
+                                                    : Color_selectiontext;
+               copy.fontInfo().setPaintColor(col);
                pi_.pain.text(int(x_), yo_, e.str, copy, e.extra);
        } else if (!some_sel) {
                pi_.pain.text(int(x_), yo_, e.str, e.font, e.extra);
@@ -357,7 +355,7 @@ void RowPainter::paintDepthBar() const
 }
 
 
-int RowPainter::paintAppendixStart(int y) const
+void RowPainter::paintAppendixStart(int y) const
 {
        FontInfo pb_font = sane_font;
        pb_font.setColor(Color_appendix);
@@ -377,8 +375,6 @@ int RowPainter::paintAppendixStart(int y) const
 
        pi_.pain.line(int(xo_ + 1), y, text_start, y, Color_appendix);
        pi_.pain.line(text_end, y, int(xo_ + width_ - 2), y, Color_appendix);
-
-       return 3 * defaultRowHeight();
 }
 
 
@@ -401,40 +397,21 @@ void RowPainter::paintTooLargeMarks(bool const left, bool const right) const
 
 void RowPainter::paintFirst() const
 {
-       BufferParams const & bparams = pi_.base.bv->buffer().params();
        Layout const & layout = par_.layout();
 
-       int y_top = 0;
-
        // start of appendix?
        if (par_.params().startOfAppendix())
-               y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
-
-       if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
-               && pit_ != 0) {
-               if (layout.latextype == LATEX_PARAGRAPH
-                   && !par_.getDepth()) {
-                       y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
-               } else {
-                       Layout const & playout = pars_[pit_ - 1].layout();
-                       if (playout.latextype == LATEX_PARAGRAPH
-                           && !pars_[pit_ - 1].getDepth()) {
-                               // is it right to use defskip here, too? (AS)
-                               y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
-                       }
-               }
-       }
+           paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
 
        bool const is_first =
                text_.isFirstInSequence(pit_) || !layout.isParagraphGroup();
        //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
 
        if (layout.labelIsInline()
-                       && (layout.labeltype != LABEL_STATIC || is_first)) {
+           && (layout.labeltype != LABEL_STATIC || is_first))
                paintLabel();
-       } else if (is_first && layout.labelIsAbove()) {
+       else if (is_first && layout.labelIsAbove())
                paintTopLevelLabel();
-       }
 }
 
 
@@ -631,11 +608,9 @@ void RowPainter::paintText()
                case Row::VIRTUAL:
                        paintStringAndSel(e);
 
-                       // Paint the spelling mark if needed.
-                       if (lyxrc.spellcheck_continuously && pi_.do_spellcheck
-                               && par_.isMisspelled(e.pos)) {
+                       // Paint the spelling marks if enabled.
+                       if (lyxrc.spellcheck_continuously && pi_.do_spellcheck)
                                paintMisspelledMark(orig_x, e);
-                       }
                        break;
                case Row::INSET: {
                        // If outer row has changed, nested insets are repaint completely.