Updates from Bennett and myself.

[lyx.git] / src / rowpainter.C

diff --git a/src/rowpainter.C b/src/rowpainter.C
index fdb3450e6407679b09c51d90fc9ce9b2853d8b10..6074cd07b950f0e61f8c7bb5ad589bd1b43c3e12 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -48,7 +48,6 @@ using frontend::FontMetrics;
 
 using std::endl;
 using std::max;
-using std::min;
 using std::string;
 
 
@@ -637,7 +636,21 @@ void RowPainter::paintLast()
        bool const is_rtl = text_.isRTL(*bv_.buffer(), par_);
        int const endlabel = getEndLabel(pit_, text_.paragraphs());
 
+       // paint imaginary end-of-paragraph character
+
+       if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
+               FontMetrics const & fm = theFontMetrics(bv_.buffer()->params().getFont());
+               int const length = fm.maxAscent() / 2;
+               LColor::color col = par_.isInserted(par_.size()) ? LColor::newtext : LColor::strikeout;
+               
+               pain_.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
+                          Painter::line_solid, Painter::line_thick);
+               pain_.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
+                          Painter::line_solid, Painter::line_thick);
+       }
+
        // draw an endlabel
+
        switch (endlabel) {
        case END_LABEL_BOX:
        case END_LABEL_FILLED_BOX: {
@@ -936,9 +949,9 @@ void paintPar
                        rp.paintChangeBar();
                        if (rit == rb)
                                rp.paintFirst();
+                       rp.paintText();
                        if (rit + 1 == re)
                                rp.paintLast();
-                       rp.paintText();
                }
                y += rit->descent();
                // Restore, see above
@@ -987,22 +1000,6 @@ void paintText(BufferView & bv,
                yy += par.descent();
        }
 
-       // Cache one paragraph above and one below
-       // Note MV: this cannot be suppressed even for singlepar.
-       // Try viewing the User Guide Mobius figure
-
-       if (vi.p1 > 0) {
-               text.redoParagraph(bv, vi.p1 - 1);
-               bv.coordCache().parPos()[&text][vi.p1 - 1] =
-                       Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent());
-       }
-
-       if (vi.p2 < pit_type(text.paragraphs().size()) - 1) {
-               text.redoParagraph(bv, vi.p2 + 1);
-               bv.coordCache().parPos()[&text][vi.p2 + 1] =
-                       Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent());
-       }
-
        // and grey out above (should not happen later)
 //     lyxerr << "par ascent: " << text.getPar(vi.p1).ascent() << endl;
        if (vi.y1 > 0 && !vi.singlepar)
@@ -1020,7 +1017,7 @@ void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
 //     lyxerr << "  paintTextInset: y: " << y << endl;
 
        y -= text.getPar(0).ascent();
-       // This flag can not be set from within same inset:
+       // This flag cannot be set from within same inset:
        bool repaintAll = refreshInside;
        for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
                y += text.getPar(pit).ascent();