#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"
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();
{
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.
// 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 << "]";
}
// 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 {
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