Transfer the setting of the current LyXView from workArea::focusInEvent() to GuiView...

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 6cf72746b5cd81ba213e8989f8f75de5e2621288..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"
@@ -172,11 +172,9 @@ ParagraphMetrics & TextMetrics::parMetrics(pit_type pit,
 
 int TextMetrics::parPosition(pit_type pit) const
 {
-       pair<pit_type, ParagraphMetrics> first = *par_metrics_.begin();
-       pair<pit_type, ParagraphMetrics> last = *par_metrics_.rbegin();
-       if (pit < first.first)
-                       return -1000000;
-       else if (pit > last.first)
+       if (pit < par_metrics_.begin()->first)
+               return -1000000;
+       else if (pit > par_metrics_.rbegin()->first)
                return +1000000;
 
        return par_metrics_[pit].position();
@@ -432,7 +430,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                if (row_index || end < par.size())
                        // If there is more than one row, expand the text to 
                        // the full allowable width. This setting here is needed
-                       // for the computeRowMetrics below().
+                       // for the computeRowMetrics() below.
                        dim_.wid = max_width_;
 
                dim.wid = rowWidth(right_margin, pit, first, end);
@@ -448,7 +446,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                else
                        row.setSelection(-1, -1);
                row.setDimension(dim);
-               computeRowMetrics(pit, row);
+               int const max_row_width = max(dim_.wid, dim.wid);
+               computeRowMetrics(pit, row, max_row_width);
                pm.computeRowSignature(row, bparams);
                first = end;
                ++row_index;
@@ -473,7 +472,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                row.pos(first);
                row.endpos(first);
                row.setDimension(dim);
-               computeRowMetrics(pit, row);
+               int const max_row_width = max(dim_.wid, dim.wid);
+               computeRowMetrics(pit, row, max_row_width);
                pm.computeRowSignature(row, bparams);
                pm.dim().des += dim.height();
        }
@@ -488,7 +488,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 
 
 void TextMetrics::computeRowMetrics(pit_type const pit,
-               Row & row) const
+               Row & row, int width) const
 {
 
        row.label_hfill = 0;
@@ -498,7 +498,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
        Buffer & buffer = bv_->buffer();
        Paragraph const & par = text_->getPar(pit);
 
-       double w = dim_.wid - row.width();
+       double w = width - row.width();
        // FIXME: put back this assertion when the crash on new doc is solved.
        //BOOST_ASSERT(w >= 0);
 
@@ -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;
@@ -1436,7 +1437,8 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
                        << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des
                        << endl;
 
-               if (x >= p.x_ && p.x_ + dim.wid
+               if (x >= p.x_
+                       && x <= p.x_ + dim.wid
                        && y >= p.y_ - dim.asc
                        && y <= p.y_ + dim.des) {
                        LYXERR(Debug::DEBUG)
@@ -1953,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 << "]";
                }
 
@@ -1994,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 {
@@ -2052,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