#include "frontends/font_metrics.h"
#include "support/LAssert.h"
#include "paragraph.h"
+#include "paragraph_funcs.h"
#include "support/textutils.h"
#include "insets/insettext.h"
#include "lyxrow.h"
#include "rowpainter.h"
#include "lyxrc.h"
-
+#include "lyxrow_funcs.h"
+#include "metricsinfo.h"
using std::max;
using lyx::pos_type;
} // namespace anon
-RowPainter::RowPainter(BufferView const & bv, LyXText const & text, Row const & row)
- : bv_(bv), pain_(bv_.painter()), text_(text), row_(row), par_(*row.par())
-{
-}
+RowPainter::RowPainter(BufferView const & bv,
+ LyXText const & text, RowList::iterator rit)
+ : bv_(bv), pain_(bv_.painter()), text_(text), row_(rit), pit_(rit->par())
+{}
/// "temporary"
LyXFont const RowPainter::getFont(pos_type pos) const
{
- Paragraph * perverted_par = const_cast<Paragraph *>(&par_);
- return text_.getFont(bv_.buffer(), perverted_par, pos);
+ return text_.getFont(bv_.buffer(), pit_, pos);
}
int RowPainter::singleWidth(lyx::pos_type pos) const
{
- BufferView * bv(perv(bv_));
- Paragraph * par(const_cast<Paragraph*>(&par_));
- return text_.singleWidth(bv, par, pos);
+ return text_.singleWidth(pit_, pos);
}
int RowPainter::singleWidth(lyx::pos_type pos, char c) const
{
- BufferView * bv(perv(bv_));
- Paragraph * par(const_cast<Paragraph*>(&par_));
- return text_.singleWidth(bv, par, pos, c);
+ return text_.singleWidth(pit_, pos, c);
}
LyXFont const RowPainter::getLabelFont() const
{
- Paragraph * par(const_cast<Paragraph*>(&par_));
- return text_.getLabelFont(bv_.buffer(), par);
+ return text_.getLabelFont(bv_.buffer(), pit_);
}
char const RowPainter::transformChar(char c, lyx::pos_type pos) const
{
- Paragraph * par(const_cast<Paragraph*>(&par_));
- return text_.transformChar(c, par, pos);
+ return text_.transformChar(c, *pit_, pos);
}
int RowPainter::leftMargin() const
{
- BufferView * bv(perv(bv_));
- Row * row(const_cast<Row *>(&row_));
- return text_.leftMargin(bv, row);
-}
-
-
-void RowPainter::paintNewline(pos_type const pos)
-{
- LyXFont const font = getFont(pos);
- int const wid = font_metrics::width('n', font);
- int const asc = font_metrics::maxAscent(font);
- int const y = yo_ + row_.baseline();
- // FIXME: rtl_pos, or ltr_pos ?
- bool const rtl_pos = (text_.bidi_level(pos) % 2 == 0);
- int xp[3];
- int yp[3];
-
- yp[0] = int(y - 0.875 * asc * 0.75);
- yp[1] = int(y - 0.500 * asc * 0.75);
- yp[2] = int(y - 0.125 * asc * 0.75);
-
- if (rtl_pos) {
- xp[0] = int(x_ + wid * 0.375);
- xp[1] = int(x_);
- xp[2] = int(x_ + wid * 0.375);
- } else {
- xp[0] = int(x_ + wid * 0.625);
- xp[1] = int(x_ + wid);
- xp[2] = int(x_ + wid * 0.625);
- }
-
- pain_.lines(xp, yp, 3, LColor::eolmarker);
-
- yp[0] = int(y - 0.500 * asc * 0.75);
- yp[1] = int(y - 0.500 * asc * 0.75);
- yp[2] = int(y - asc * 0.75);
-
- if (rtl_pos) {
- xp[0] = int(x_);
- xp[1] = int(x_ + wid);
- xp[2] = int(x_ + wid);
- } else {
- xp[0] = int(x_ + wid);
- xp[1] = int(x_);
- xp[2] = int(x_);
- }
-
- pain_.lines(xp, yp, 3, LColor::eolmarker);
-
- x_ += wid;
+ return text_.leftMargin(*row_);
}
-bool RowPainter::paintInset(pos_type const pos)
+void RowPainter::paintInset(pos_type const pos)
{
- Inset * inset = const_cast<Inset*>(par_.getInset(pos));
+ Inset * inset = const_cast<Inset*>(pit_->getInset(pos));
lyx::Assert(inset);
- LyXFont const & font = getFont(pos);
-
- inset->update(perv(bv_), font, false);
- inset->draw(perv(bv_), font, yo_ + row_.baseline(), x_, cleared_);
+#warning inset->update FIXME
+ inset->update(perv(bv_), false);
- // return true if something changed when we drew an inset
-
- return (!text_.need_break_row && !text_.isInInset()
- && bv_.text->status() == LyXText::CHANGED_IN_DRAW);
+ PainterInfo pi(perv(bv_));
+ pi.base.font = getFont(pos);
+ int const w = inset->width(perv(bv_), pi.base.font);
+ inset->draw(pi, int(x_), yo_ + row_->baseline());
+ x_ += w;
}
string str;
// first char
- char c = par_.getChar(pos);
+ char c = pit_->getChar(pos);
str += c;
++vpos;
int dx = 0;
for (pos_type i = pos - 1; i >= 0; --i) {
- c = par_.getChar(i);
+ c = pit_->getChar(i);
if (!Encodings::IsComposeChar_hebrew(c)) {
if (IsPrintableNonspace(c)) {
int const width2 =
}
// Draw nikud
- pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
+ pain_.text(int(x_) + dx, yo_ + row_->baseline(), str, font);
}
string str;
// first char
- char c = par_.getChar(pos);
+ char c = pit_->getChar(pos);
c = transformChar(c, pos);
str +=c;
++vpos;
int const width = font_metrics::width(c, font);
int dx = 0;
- for (pos_type i = pos-1; i >= 0; --i) {
- c = par_.getChar(i);
+ for (pos_type i = pos - 1; i >= 0; --i) {
+ c = pit_->getChar(i);
if (!Encodings::IsComposeChar_arabic(c)) {
if (IsPrintableNonspace(c)) {
int const width2 =
}
}
// Draw nikud
- pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
+ pain_.text(int(x_) + dx, yo_ + row_->baseline(), str, font);
}
void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
{
pos_type pos = text_.vis2log(vpos);
- pos_type const last = row_.lastPrintablePos();
+ pos_type const last = lastPrintablePos(text_, row_);
LyXFont orig_font(getFont(pos));
// first character
string str;
- str += par_.getChar(pos);
+ str += pit_->getChar(pos);
if (arabic) {
unsigned char c = str[0];
str[0] = transformChar(c, pos);
}
- bool prev_struckout(isDeletedText(par_, pos));
- bool prev_newtext(isInsertedText(par_, pos));
+ bool prev_struckout(isDeletedText(*pit_, pos));
+ bool prev_newtext(isInsertedText(*pit_, pos));
++vpos;
// collect as much similar chars as we can
while (vpos <= last && (pos = text_.vis2log(vpos)) >= 0) {
- char c = par_.getChar(pos);
+ char c = pit_->getChar(pos);
if (!IsPrintableNonspace(c))
break;
- if (prev_struckout != isDeletedText(par_, pos))
+ if (prev_struckout != isDeletedText(*pit_, pos))
break;
- if (prev_newtext != isInsertedText(par_, pos))
+ if (prev_newtext != isInsertedText(*pit_, pos))
break;
if (arabic && Encodings::IsComposeChar_arabic(c))
}
// Draw text and set the new x position
- pain_.text(int(x_), yo_ + row_.baseline(), str, orig_font);
+ pain_.text(int(x_), yo_ + row_->baseline(), str, orig_font);
x_ += font_metrics::width(str, orig_font);
}
if (orig_font.language() == bv_.buffer()->params.language)
return;
- int const y = yo_ + row_.baseline() + 1;
+ int const y = yo_ + row_->baseline() + 1;
pain_.line(int(orig_x), y, int(x_), y, LColor::language);
}
-bool RowPainter::paintFromPos(pos_type & vpos)
+void RowPainter::paintFromPos(pos_type & vpos)
{
pos_type const pos = text_.vis2log(vpos);
float const orig_x = x_;
- char const c = par_.getChar(pos);
+ char const c = pit_->getChar(pos);
- if (IsNewlineChar(c)) {
- ++vpos;
- paintNewline(pos);
- return true;
- } else if (IsInsetChar(c)) {
- if (paintInset(pos))
- return true;
+ if (IsInsetChar(c)) {
+ paintInset(pos);
++vpos;
paintForeignMark(orig_x, orig_font);
- return false;
+ return;
}
// usual characters, no insets
paintForeignMark(orig_x, orig_font);
- return false;
+ return;
}
-bool RowPainter::paintBackground()
+void RowPainter::paintBackground()
{
- pos_type const last = row_.lastPrintablePos();
- bool clear_area = true;
- Inset const * inset = 0;
-
- if (!bv_.screen().forceClear() && last == row_.pos()
- && par_.isInset(row_.pos())) {
- inset = par_.getInset(row_.pos());
- clear_area = inset->doClearArea();
- }
-
- if (cleared_) {
- return true;
- }
-
- if (clear_area) {
- int const x = xo_;
- int const y = yo_ < 0 ? 0 : yo_;
- int const h = yo_ < 0 ? row_.height() + yo_ : row_.height();
- pain_.fillRectangle(x, y, width_, h, text_.backgroundColor());
- return true;
- }
-
- if (!inset)
- return false;
-
- LyXFont font(LyXFont::ALL_SANE);
-
- // FIXME
- BufferView * bv = perv(bv_);
-
- int h = row_.baseline() - inset->ascent(bv, font);
-
- // first clear the whole row above the inset!
- if (h > 0) {
- pain_.fillRectangle(xo_, yo_, width_, h, text_.backgroundColor());
- }
-
- // clear the space below the inset!
- h += inset->ascent(bv, font) + inset->descent(bv, font);
- if ((row_.height() - h) > 0) {
- pain_.fillRectangle(xo_, yo_ + h,
- width_, row_.height() - h, text_.backgroundColor());
- }
-
- // clear the space behind the inset, if needed
- if (!inset->display() && !inset->needFullRow()) {
- int const xp = int(x_) + inset->width(bv, font);
- if (width_ - xp > 0) {
- pain_.fillRectangle(xp, yo_, width_ - xp,
- row_.height(), text_.backgroundColor());
- }
- }
-
- return false;
+ int const x = xo_;
+ int const y = yo_ < 0 ? 0 : yo_;
+ int const h = yo_ < 0 ? row_->height() + yo_ : row_->height();
+ pain_.fillRectangle(x, y, width_, h, text_.backgroundColor());
}
void RowPainter::paintSelection()
{
- bool const is_rtl = par_.isRightToLeftPar(bv_.buffer()->params);
+ bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params);
// the current selection
int const startx = text_.selection.start.x();
int const endx = text_.selection.end.x();
int const starty = text_.selection.start.y();
int const endy = text_.selection.end.y();
- Row const * startrow = text_.selection.start.row();
- Row const * endrow = text_.selection.end.row();
-
- // Bleh.
- Row const * row = &row_;
+ RowList::iterator startrow = text_.selection.start.row();
+ RowList::iterator endrow = text_.selection.end.row();
if (text_.bidi_same_direction) {
int x;
int y = yo_;
int w;
- int h = row_.height();
+ int h = row_->height();
- if (startrow == row && endrow == row) {
+ if (startrow == row_ && endrow == row_) {
if (startx < endx) {
x = xo_ + startx;
w = endx - startx;
w = startx - endx;
pain_.fillRectangle(x, y, w, h, LColor::selection);
}
- } else if (startrow == row) {
+ } else if (startrow == row_) {
int const x = (is_rtl) ? xo_ : (xo_ + startx);
int const w = (is_rtl) ? startx : (width_ - startx);
pain_.fillRectangle(x, y, w, h, LColor::selection);
- } else if (endrow == row) {
+ } else if (endrow == row_) {
int const x = (is_rtl) ? (xo_ + endx) : xo_;
int const w = (is_rtl) ? (width_ - endx) : endx;
pain_.fillRectangle(x, y, w, h, LColor::selection);
pain_.fillRectangle(xo_, y, width_, h, LColor::selection);
}
return;
- } else if (startrow != row && endrow != row) {
+ } else if (startrow != row_ && endrow != row_) {
if (y_ > starty && y_ < endy) {
int w = width_;
- int h = row_.height();
+ int h = row_->height();
pain_.fillRectangle(xo_, yo_, w, h, LColor::selection);
}
return;
}
- if ((startrow != row && !is_rtl) || (endrow != row && is_rtl))
- pain_.fillRectangle(xo_, yo_, int(x_), row_.height(), LColor::selection);
+ if ((startrow != row_ && !is_rtl) || (endrow != row_ && is_rtl))
+ pain_.fillRectangle(xo_, yo_, int(x_), row_->height(), LColor::selection);
- pos_type const body_pos = par_.beginningOfBody();
- pos_type const last = row_.lastPrintablePos();
+ pos_type const body_pos = pit_->beginningOfBody();
+ pos_type const last = lastPrintablePos(text_, row_);
float tmpx = x_;
- for (pos_type vpos = row_.pos(); vpos <= last; ++vpos) {
+ for (pos_type vpos = row_->pos(); vpos <= last; ++vpos) {
pos_type pos = text_.vis2log(vpos);
float const old_tmpx = tmpx;
if (body_pos > 0 && pos == body_pos - 1) {
- LyXLayout_ptr const & layout = par_.layout();
+ LyXLayout_ptr const & layout = pit_->layout();
LyXFont const lfont = getLabelFont();
tmpx += label_hfill_ + font_metrics::width(layout->labelsep, lfont);
- if (par_.isLineSeparator(body_pos - 1))
+ if (pit_->isLineSeparator(body_pos - 1))
tmpx -= singleWidth(body_pos - 1);
}
- if (row_.hfillExpansion(pos)) {
+ if (hfillExpansion(text_, row_, pos)) {
tmpx += singleWidth(pos);
if (pos >= body_pos)
tmpx += hfill_;
tmpx += label_hfill_;
}
- else if (par_.isSeparator(pos)) {
+ else if (pit_->isSeparator(pos)) {
tmpx += singleWidth(pos);
if (pos >= body_pos)
tmpx += separator_;
tmpx += singleWidth(pos);
}
- if ((startrow != row || text_.selection.start.pos() <= pos) &&
- (endrow != row || pos < text_.selection.end.pos())) {
+ if ((startrow != row_ || text_.selection.start.pos() <= pos) &&
+ (endrow != row_ || pos < text_.selection.end.pos())) {
// Here we do not use x_ as xo_ was added to x_.
pain_.fillRectangle(int(old_tmpx), yo_,
int(tmpx - old_tmpx + 1),
- row_.height(), LColor::selection);
+ row_->height(), LColor::selection);
}
}
- if ((startrow != row && is_rtl) || (endrow != row && !is_rtl)) {
+ if ((startrow != row_ && is_rtl) || (endrow != row_ && !is_rtl)) {
pain_.fillRectangle(xo_ + int(tmpx),
yo_, int(bv_.workWidth() - tmpx),
- row_.height(), LColor::selection);
+ row_->height(), LColor::selection);
}
}
void RowPainter::paintChangeBar()
{
- pos_type const start = row_.pos();
- pos_type const end = row_.lastPrintablePos();
+ pos_type const start = row_->pos();
+ pos_type const end = lastPrintablePos(text_, row_);
- if (!par_.isChanged(start, end))
+ if (!pit_->isChanged(start, end))
return;
- int const height = (row_.next()
- ? row_.height() + row_.next()->top_of_text()
- : row_.baseline());
+ int const height = (boost::next(row_) != text_.rows().end()
+ ? row_->height() + boost::next(row_)->top_of_text()
+ : row_->baseline());
pain_.fillRectangle(4, yo_, 5, height, LColor::changebar);
}
void RowPainter::paintAppendix()
{
+ if (!pit_->params().appendix())
+ return;
+
// FIXME: can be just width_ ?
int const ww = bv_.workWidth();
- if (par_.params().appendix()) {
- pain_.line(1, yo_, 1, yo_ + row_.height(), LColor::appendixline);
- pain_.line(ww - 2, yo_, ww - 2, yo_ + row_.height(), LColor::appendixline);
- }
+ int y = yo_;
+
+ if (pit_->params().startOfAppendix())
+ y += 2 * defaultRowHeight();
+
+ pain_.line(1, y, 1, yo_ + row_->height(), LColor::appendix);
+ pain_.line(ww - 2, y, ww - 2, yo_ + row_->height(), LColor::appendix);
}
void RowPainter::paintDepthBar()
{
- Paragraph::depth_type const depth = par_.getDepth();
+ Paragraph::depth_type const depth = pit_->getDepth();
if (depth <= 0)
return;
Paragraph::depth_type prev_depth = 0;
- if (row_.previous())
- prev_depth = row_.previous()->par()->getDepth();
+ if (row_ != text_.rows().begin())
+ prev_depth = boost::prior(row_)->par()->getDepth();
Paragraph::depth_type next_depth = 0;
- if (row_.next())
- next_depth = row_.next()->par()->getDepth();
+ if (boost::next(row_) != text_.rows().end())
+ next_depth = boost::next(row_)->par()->getDepth();
for (Paragraph::depth_type i = 1; i <= depth; ++i) {
int x = (PAPER_MARGIN / 5) * i + xo_;
// only consider the changebar space if we're drawing outer left
if (!xo_)
x += CHANGEBAR_MARGIN;
- int const h = yo_ + row_.height() - 1 - (i - next_depth - 1) * 3;
+ int const h = yo_ + row_->height() - 1 - (i - next_depth - 1) * 3;
pain_.line(x, yo_, x, h, LColor::depthbar);
}
+int RowPainter::paintAppendixStart(int y)
+{
+ LyXFont pb_font;
+ pb_font.setColor(LColor::appendix).decSize();
+
+ string const label = _("Appendix");
+ int w = 0;
+ int a = 0;
+ int d = 0;
+ font_metrics::rectText(label, pb_font, w, a, d);
+
+ int const text_start = xo_ + ((width_ - w) / 2);
+ int const text_end = text_start + w;
+
+ pain_.rectText(text_start, y + d, label, pb_font);
+
+ pain_.line(xo_ + 1, y, text_start, y, LColor::appendix);
+ pain_.line(text_end, y, xo_ + width_ - 2, y, LColor::appendix);
+
+ return 3 * defaultRowHeight();
+}
+
+
void RowPainter::paintFirst()
{
- ParagraphParameters const & parparams = par_.params();
+ ParagraphParameters const & parparams = pit_->params();
+
+ int y_top = 0;
// start of appendix?
if (parparams.startOfAppendix()) {
- pain_.line(1, yo_, width_ - 2, yo_, LColor::appendixline);
+ y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
}
- int y_top = 0;
-
// the top margin
- if (!row_.previous() && text_.isTopLevel())
+ if (row_ == text_.rows().begin() && !text_.isInInset())
y_top += PAPER_MARGIN;
// draw a top pagebreak
Buffer const * buffer = bv_.buffer();
- LyXLayout_ptr const & layout = par_.layout();
+ LyXLayout_ptr const & layout = pit_->layout();
if (buffer->params.paragraph_separation == BufferParams::PARSEP_SKIP) {
- if (par_.previous()) {
+ if (pit_ != text_.ownerParagraphs().begin()) {
if (layout->latextype == LATEX_PARAGRAPH
- && !par_.getDepth()) {
+ && !pit_->getDepth()) {
y_top += buffer->params.getDefSkip().inPixels(bv_);
} else {
LyXLayout_ptr const & playout =
- par_.previous()->layout();
+ boost::prior(pit_)->layout();
if (playout->latextype == LATEX_PARAGRAPH
- && !par_.previous()->getDepth()) {
+ && !boost::prior(pit_)->getDepth()) {
// is it right to use defskip here, too? (AS)
y_top += buffer->params.getDefSkip().inPixels(bv_);
}
y_top += asc;
}
- bool const is_rtl = par_.isRightToLeftPar(bv_.buffer()->params);
+ bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params);
// should we print a label?
if (layout->labeltype >= LABEL_STATIC
&& (layout->labeltype != LABEL_STATIC
|| layout->latextype != LATEX_ENVIRONMENT
- || par_.isFirstInSequence())) {
+ || isFirstInSequence(pit_, text_.ownerParagraphs()))) {
LyXFont font = getLabelFont();
- if (!par_.getLabelstring().empty()) {
+ if (!pit_->getLabelstring().empty()) {
float x = x_;
- string const str = par_.getLabelstring();
+ string const str = pit_->getLabelstring();
// this is special code for the chapter layout. This is
// printed in an extra row and has a pagebreak at
}
pain_.text(int(x),
- yo_ + row_.baseline() -
- row_.ascent_of_text() - maxdesc,
+ yo_ + row_->baseline() -
+ row_->ascent_of_text() - maxdesc,
str, font);
}
} else {
- font_metrics::width(str, font);
}
- pain_.text(int(x), yo_ + row_.baseline(), str, font);
+ pain_.text(int(x), yo_ + row_->baseline(), str, font);
}
}
// the labels at the top of an environment.
// More or less for bibliography
- } else if (par_.isFirstInSequence() &&
+ } else if (isFirstInSequence(pit_, text_.ownerParagraphs()) &&
(layout->labeltype == LABEL_TOP_ENVIRONMENT ||
layout->labeltype == LABEL_BIBLIO ||
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
LyXFont font = getLabelFont();
- if (!par_.getLabelstring().empty()) {
- string const str = par_.getLabelstring();
+ if (!pit_->getLabelstring().empty()) {
+ string const str = pit_->getLabelstring();
float spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
float x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
x = ((is_rtl ? leftMargin() : x_)
- + ww - text_.rightMargin(*bv_.buffer(), row_)) / 2;
+ + ww - text_.rightMargin(*bv_.buffer(), *row_)) / 2;
x -= font_metrics::width(str, font) / 2;
} else if (is_rtl) {
x = ww - leftMargin() -
font_metrics::width(str, font);
}
- pain_.text(int(x), yo_ + row_.baseline()
- - row_.ascent_of_text() - maxdesc,
+ pain_.text(int(x), yo_ + row_->baseline()
+ - row_->ascent_of_text() - maxdesc,
str, font);
}
}
void RowPainter::paintLast()
{
- ParagraphParameters const & parparams = par_.params();
- int y_bottom = row_.height() - 1;
+ ParagraphParameters const & parparams = pit_->params();
+ int y_bottom = row_->height() - 1;
// the bottom margin
- if (!row_.next() && text_.isTopLevel())
+ if (boost::next(row_) == text_.rows().end() && !text_.isInInset())
y_bottom -= PAPER_MARGIN;
int const ww = bv_.workWidth();
if (parparams.lineBottom()) {
LyXFont font(LyXFont::ALL_SANE);
int const asc = font_metrics::ascent('x',
- getFont(max(pos_type(0), par_.size() - 1)));
+ getFont(max(pos_type(0), pit_->size() - 1)));
y_bottom -= asc;
y_bottom -= asc;
}
- bool const is_rtl = par_.isRightToLeftPar(bv_.buffer()->params);
- int const endlabel = par_.getEndLabel();
+ bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params);
+ int const endlabel = getEndLabel(pit_, text_.ownerParagraphs());
// draw an endlabel
switch (endlabel) {
{
LyXFont const font = getLabelFont();
int const size = int(0.75 * font_metrics::maxAscent(font));
- int const y = (yo_ + row_.baseline()) - size;
+ int const y = (yo_ + row_->baseline()) - size;
int x = is_rtl ? LEFT_MARGIN : ww - PAPER_MARGIN - size;
- if (row_.fill() <= size)
- x += (size - row_.fill() + 1) * (is_rtl ? -1 : 1);
+ if (row_->fill() <= size)
+ x += (size - row_->fill() + 1) * (is_rtl ? -1 : 1);
if (endlabel == END_LABEL_BOX) {
pain_.rectangle(x, y, size, size, LColor::eolmarker);
#else
LyXFont font = getLabelFont();
#endif
- string const & str = par_.layout()->endlabelstring();
+ string const & str = pit_->layout()->endlabelstring();
int const x = is_rtl ?
int(x_) - font_metrics::width(str, font)
- : ww - text_.rightMargin(*bv_.buffer(), row_) - row_.fill();
- pain_.text(x, yo_ + row_.baseline(), str, font);
+ : ww - text_.rightMargin(*bv_.buffer(), *row_) - row_->fill();
+ pain_.text(x, yo_ + row_->baseline(), str, font);
break;
}
case END_LABEL_NO_LABEL:
}
-bool RowPainter::paintText()
+void RowPainter::paintText()
{
- pos_type const last = row_.lastPrintablePos();
- pos_type body_pos = par_.beginningOfBody();
+ pos_type const last = lastPrintablePos(text_, row_);
+ pos_type body_pos = pit_->beginningOfBody();
if (body_pos > 0 &&
(body_pos - 1 > last ||
- !par_.isLineSeparator(body_pos - 1))) {
+ !pit_->isLineSeparator(body_pos - 1))) {
body_pos = 0;
}
- LyXLayout_ptr const & layout = par_.layout();
+ LyXLayout_ptr const & layout = pit_->layout();
bool running_strikeout = false;
bool is_struckout = false;
float last_strikeout_x = 0.0;
- pos_type vpos = row_.pos();
+ pos_type vpos = row_->pos();
while (vpos <= last) {
if (x_ > bv_.workWidth())
break;
pos_type pos = text_.vis2log(vpos);
+ if (pos >= pit_->size()) {
+ ++vpos;
+ continue;
+ }
+
if (x_ + singleWidth(pos) < 0) {
x_ += singleWidth(pos);
++vpos;
continue;
}
- is_struckout = isDeletedText(par_, pos);
+ is_struckout = isDeletedText(*pit_, pos);
if (is_struckout && !running_strikeout) {
running_strikeout = true;
last_strikeout_x = x_;
}
- bool const highly_editable_inset = par_.isInset(pos)
- && isHighlyEditableInset(par_.getInset(pos));
+ bool const highly_editable_inset = pit_->isInset(pos)
+ && isHighlyEditableInset(pit_->getInset(pos));
// if we reach the end of a struck out range, paint it
// we also don't paint across things like tables
if (running_strikeout && (highly_editable_inset || !is_struckout)) {
- int const middle = yo_ + row_.top_of_text()
- + ((row_.baseline() - row_.top_of_text()) / 2);
+ int const middle = yo_ + row_->top_of_text()
+ + ((row_->baseline() - row_->top_of_text()) / 2);
pain_.line(int(last_strikeout_x), middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
- singleWidth(body_pos - 1);
}
- if (par_.isHfill(pos)) {
+ if (pit_->isHfill(pos)) {
x_ += 1;
- int const y0 = yo_ + row_.baseline();
+ int const y0 = yo_ + row_->baseline();
int const y1 = y0 - defaultRowHeight() / 2;
pain_.line(int(x_), y1, int(x_), y0,
LColor::added_space);
- if (row_.hfillExpansion(pos)) {
+ if (hfillExpansion(text_, row_, pos)) {
int const y2 = (y0 + y1) / 2;
if (pos >= body_pos) {
}
x_ += 2;
++vpos;
- } else if (par_.isSeparator(pos)) {
+ } else if (pit_->isSeparator(pos)) {
x_ += singleWidth(pos);
if (pos >= body_pos)
x_ += separator_;
++vpos;
} else {
- if (paintFromPos(vpos))
- return true;
+ paintFromPos(vpos);
}
}
// if we reach the end of a struck out range, paint it
if (running_strikeout) {
- int const middle = yo_ + row_.top_of_text()
- + ((row_.baseline() - row_.top_of_text()) / 2);
+ int const middle = yo_ + row_->top_of_text()
+ + ((row_->baseline() - row_->top_of_text()) / 2);
pain_.line(int(last_strikeout_x), middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
- return false;
+ return;
}
-bool RowPainter::paint(int y_offset, int x_offset, int y, bool cleared)
+void RowPainter::paint(int y_offset, int x_offset, int y)
{
xo_ = x_offset;
yo_ = y_offset;
y_ = y;
- cleared_ = cleared;
width_ = text_.isInInset()
? text_.inset_owner->textWidth(perv(bv_), true) : bv_.workWidth();
// FIXME: must be a cleaner way here. Aren't these calculations
// belonging to row metrics ?
- BufferView * bv(const_cast<BufferView *>(&bv_));
- Row * row(const_cast<Row *>(&row_));
- text_.prepareToPrint(bv, row, x_, separator_, hfill_, label_hfill_);
+ text_.prepareToPrint(row_, x_, separator_, hfill_, label_hfill_);
// FIXME: what is this fixing ?
if (text_.isInInset() && (x_ < 0))
x_ = 0;
x_ += xo_;
- // clear to background if necessary
- cleared_ = paintBackground();
+ // If we're *not* at the top-level of rows, then the
+ // background has already been cleared.
+ if (&text_ == bv_.text)
+ paintBackground();
// paint the selection background
if (text_.selection.set()) {
// changebar
paintChangeBar();
- if (row_.isParStart()) {
+ if (row_->isParStart()) {
paintFirst();
}
- if (row_.isParEnd()) {
+ if (isParEnd(text_, row_)) {
paintLast();
}
// paint text
- return paintText();
+ paintText();
}
projects / lyx.git / blobdiff