next one

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index f751720f98e8db3198807995981ad5a6d6f0c8da..dc47b425877ecfab87d432657ddfb3a138926fc2 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -24,12 +24,12 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "bufferview_funcs.h"
 #include "Color.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
+#include "Layout.h"
 #include "Length.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -1177,7 +1177,7 @@ void TextMetrics::newParMetricsDown()
 {
        pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
        pit_type const pit = last.first + 1;
-       if (pit == text_->paragraphs().size())
+       if (pit == int(text_->paragraphs().size()))
                return;
 
        // do it and update its position.
@@ -1281,7 +1281,8 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
        int yy = pm.position() - pm.ascent();
        BOOST_ASSERT(!pm.rows().empty());
        RowList::const_iterator rit = pm.rows().begin();
-       RowList::const_iterator const rlast = boost::prior(pm.rows().end());
+       RowList::const_iterator rlast = pm.rows().end();
+       --rlast;
        for (; rit != rlast; yy += rit->height(), ++rit)
                if (yy + rit->height() > y)
                        break;
@@ -1954,10 +1955,10 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
                // 12 lines lower):
                if (lyxerr.debugging(Debug::PAINTING)) {
                        if (text_->isMainText(bv_->buffer()))
-                               LYXERR(Debug::PAINTING) << "\n{" <<
+                               LYXERR(Debug::PAINTING) << "\n{" << inside <<
                                pi.full_repaint << row_has_changed << "}";
                        else
-                               LYXERR(Debug::PAINTING) << "[" <<
+                               LYXERR(Debug::PAINTING) << "[" << inside <<
                                pi.full_repaint << row_has_changed << "]";
                }
 
@@ -1995,24 +1996,22 @@ void TextMetrics::drawSelection(PainterInfo & pi,
 
        // clip above
        int middleTop;
-       bool const clipAbove = 
-               (bv_funcs::status(bv_, beg) == bv_funcs::CUR_ABOVE);
+       bool const clipAbove = (bv_->cursorStatus(beg) == CUR_ABOVE);
        if (clipAbove)
                middleTop = 0;
        else
-               middleTop = bv_funcs::getPos(*bv_, beg, beg.boundary()).y_ + row1.descent();
+               middleTop = bv_->getPos(beg, beg.boundary()).y_ + row1.descent();
        
        // clip below
        int middleBottom;
-       bool const clipBelow = 
-               (bv_funcs::status(bv_, end) == bv_funcs::CUR_BELOW);
+       bool const clipBelow = (bv_->cursorStatus(end) == CUR_BELOW);
        if (clipBelow)
                middleBottom = bv_->workHeight();
        else
-               middleBottom = bv_funcs::getPos(*bv_, end, end.boundary()).y_ - row2.ascent();
+               middleBottom = bv_->getPos(end, end.boundary()).y_ - row2.ascent();
 
        // start and end in the same line?
-       if (!(clipAbove || clipBelow) && &row1 == &row2)
+       if (!clipAbove && !clipBelow && &row1 == &row2)
                // then only draw this row's selection
                drawRowSelection(pi, x, row1, beg, end, false, false);
        else {
@@ -2053,7 +2052,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
        DocIterator cur = beg;
        int x1 = cursorX(beg.top(), beg.boundary());
        int x2 = cursorX(end.top(), end.boundary());
-       int y1 = bv_funcs::getPos(*bv_, cur, cur.boundary()).y_ - row.ascent();
+       int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
        int y2 = y1 + row.height();
        
        // draw the margins