#include "Row.h"
#include "MetricsInfo.h"
#include "Paragraph.h"
-#include "ParagraphMetrics.h"
#include "ParagraphParameters.h"
#include "TextMetrics.h"
#include "VSpace.h"
RowPainter::RowPainter(PainterInfo & pi,
Text const & text, Row const & row, int x, int y)
: pi_(pi), text_(text),
- text_metrics_(pi_.base.bv->textMetrics(&text)),
+ tm_(pi_.base.bv->textMetrics(&text)),
pars_(text.paragraphs()),
row_(row), par_(text.paragraphs()[row.pit()]),
- pm_(text_metrics_.parMetrics(row.pit())), change_(pi_.change_),
- xo_(x), yo_(y), width_(text_metrics_.width())
+ change_(pi_.change_),
+ xo_(x), yo_(y)
{
x_ = row_.left_margin + xo_;
{
FontInfo f = text_.labelFont(par_);
// selected text?
- if (row_.begin_margin_sel || pi_.selected)
+ if ((row_.selection() && row_.begin_margin_sel) || pi_.selected)
f.setPaintColor(Color_selectiontext);
return f;
}
if (x1 > x2)
swap(x1, x2);
- pi_.pain.line(int(x_ + x1), y, int(x_ + x2), y,
+ pi_.pain.line(int(x_ + x1), y, int(x_ + x2), y,
Color_error,
Painter::line_onoffdash, thickness);
pos = range.last + 1;
void RowPainter::paintChangeBar() const
{
- pos_type const start = row_.pos();
- pos_type end = row_.endpos();
-
- if (par_.size() == end) {
- // this is the last row of the paragraph;
- // thus, we must also consider the imaginary end-of-par character
- end++;
- }
-
- if (start == end || !par_.isChanged(start, end))
- return;
-
- int const height = text_metrics_.isLastRow(row_)
+ int const height = tm_.isLastRow(row_)
? row_.ascent()
: row_.height();
y += 2 * defaultRowHeight();
pi_.pain.line(1, y, 1, yo_ + row_.height(), Color_appendix);
- pi_.pain.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), Color_appendix);
+ pi_.pain.line(tm_.width() - 2, y, tm_.width() - 2, yo_ + row_.height(), Color_appendix);
}
return;
depth_type prev_depth = 0;
- if (!text_metrics_.isFirstRow(row_)) {
+ if (!tm_.isFirstRow(row_)) {
pit_type pit2 = row_.pit();
if (row_.pos() == 0)
--pit2;
}
depth_type next_depth = 0;
- if (!text_metrics_.isLastRow(row_)) {
+ if (!tm_.isLastRow(row_)) {
pit_type pit2 = row_.pit();
if (row_.endpos() >= pars_[pit2].size())
++pit2;
docstring const label = _("Appendix");
theFontMetrics(pb_font).rectText(label, w, a, d);
- int const text_start = int(xo_ + (width_ - w) / 2);
+ int const text_start = int(xo_ + (tm_.width() - w) / 2);
int const text_end = text_start + w;
pi_.pain.rectText(text_start, y + d, label, pb_font, Color_none, Color_none);
pi_.pain.line(int(xo_ + 1), y, text_start, y, Color_appendix);
- pi_.pain.line(text_end, y, int(xo_ + width_ - 2), y, Color_appendix);
+ pi_.pain.line(text_end, y, int(xo_ + tm_.width() - 2), y, Color_appendix);
}
if (str.empty())
return;
- bool const is_rtl = text_.isRTL(par_);
Layout const & layout = par_.layout();
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
double x = x_;
- if (is_rtl)
- x = width_ - row_.right_margin + fm.width(layout.labelsep);
+ if (row_.isRTL())
+ x = tm_.width() - row_.right_margin + fm.width(layout.labelsep);
else
x = x_ - fm.width(layout.labelsep) - fm.width(str);
void RowPainter::paintTopLevelLabel() const
{
BufferParams const & bparams = pi_.base.bv->buffer().params();
- bool const is_rtl = text_.isRTL(par_);
ParagraphParameters const & pparams = par_.params();
Layout const & layout = par_.layout();
FontInfo const font = labelFont();
double x = x_;
if (layout.labeltype == LABEL_CENTERED) {
- x = row_.left_margin + (width_ - row_.left_margin - row_.right_margin) / 2;
+ x = row_.left_margin + (tm_.width() - row_.left_margin - row_.right_margin) / 2;
x -= fm.width(str) / 2;
- } else if (is_rtl) {
- x = width_ - row_.right_margin - fm.width(str);
+ } else if (row_.isRTL()) {
+ x = tm_.width() - row_.right_margin - fm.width(str);
}
pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
void RowPainter::paintLast() const
{
- bool const is_rtl = text_.isRTL(par_);
int const endlabel = getEndLabel(row_.pit(), text_);
// paint imaginary end-of-paragraph character
// If needed, move the box a bit to avoid overlapping with text.
int x = 0;
- if (is_rtl) {
+ if (row_.isRTL()) {
int const normal_x = nestMargin() + changebarMargin();
x = min(normal_x, row_.left_margin - size - Inset::TEXT_TO_INSET_OFFSET);
} else {
- int const normal_x = width_ - row_.right_margin
+ int const normal_x = tm_.width() - row_.right_margin
- size - Inset::TEXT_TO_INSET_OFFSET;
x = max(normal_x, row_.width());
}
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout().endlabelstring();
- double const x = is_rtl ? x_ - fm.width(str) : x_;
+ double const x = row_.isRTL() ? x_ - fm.width(str) : x_;
pi_.pain.text(int(x), yo_, str, font);
break;
}
paintStringAndSel(e);
// Paint the spelling marks if enabled.
- if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && pi_.pain.isDrawingEnabled())
+ if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && !pi_.pain.isNull())
paintMisspelledMark(e);
break;
int const y1 = yo_ - row_.ascent();
int const y2 = y1 + row_.height();
- bool const rtl = text_.isRTL(par_);
// draw the margins
- if ((row_.begin_margin_sel && !rtl) || (row_.end_margin_sel && rtl))
+ if (row_.isRTL() ? row_.end_margin_sel : row_.begin_margin_sel)
pi_.pain.fillRectangle(int(xo_), y1, row_.left_margin, y2 - y1,
Color_selection);
+
// go through row and draw from RTL boundary to RTL boundary
- int x = xo_ + row_.left_margin;
+ double x = xo_ + row_.left_margin;
for (auto const & e : row_) {
+ // These are the same tests as in paintStringAndSel, except
+ // that all_sel has an additional clause that triggers for end
+ // of paragraph markers. The clause was not used in
+ // paintStringAndSel to avoid changing the drawing color.
// at least part of text selected?
- bool const some_sel = (e.endpos >= row_.sel_beg && e.pos <= row_.sel_end)
+ bool const some_sel = (e.endpos >= row_.sel_beg && e.pos < row_.sel_end)
|| pi_.selected;
// all the text selected?
- bool const all_sel = (e.pos >= row_.sel_beg && e.endpos <= row_.sel_end)
- || pi_.selected;
+ bool const all_sel = (e.pos >= row_.sel_beg && e.endpos < row_.sel_end)
+ || (e.isVirtual() && e.pos == row_.endpos() && row_.end_margin_sel)
+ || pi_.selected;
if (all_sel) {
- pi_.pain.fillRectangle(x, y1, e.full_width(), y2 - y1,
+ // the 3rd argument is written like that to avoid rounding issues
+ pi_.pain.fillRectangle(int(x), y1,
+ int(x + e.full_width()) - int(x), y2 - y1,
Color_selection);
} else if (some_sel) {
pos_type const from = min(max(row_.sel_beg, e.pos), e.endpos);
pos_type const to = max(min(row_.sel_end, e.endpos), e.pos);
- int x1 = e.pos2x(from);
- int x2 = e.pos2x(to);
+ double x1 = e.pos2x(from);
+ double x2 = e.pos2x(to);
if (x1 > x2)
swap(x1, x2);
- pi_.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
- Color_selection);
+ // the 3rd argument is written like that to avoid rounding issues
+ pi_.pain.fillRectangle(int(x + x1), y1, int(x2 + x) - int(x1 + x),
+ y2 - y1, Color_selection);
}
x += e.full_width();
}
- if ((row_.begin_margin_sel && rtl) || (row_.end_margin_sel && !rtl))
- pi_.pain.fillRectangle(x, y1, int(xo_) + text_metrics_.width() - x, y2 - y1,
+ if (row_.isRTL() ? row_.begin_margin_sel : row_.end_margin_sel)
+ pi_.pain.fillRectangle(int(x), y1,
+ int(xo_ + tm_.width()) - int(x), y2 - y1,
Color_selection);
}
projects / lyx.git / blobdiff