#include "support/lassert.h"
#include <boost/crc.hpp>
+#include <stdlib.h>
+
using namespace std;
namespace lyx {
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()),
- solid_line_thickness_(1), solid_line_offset_(1),
- dotted_line_thickness_(1)
+ xo_(x), yo_(y), width_(text_metrics_.width())
{
- if (lyxrc.zoom >= 200) {
- // derive the line thickness from zoom factor
- // the zoom is given in percent
- // (increase thickness at 250%, 450% etc.)
- solid_line_thickness_ = (lyxrc.zoom + 50) / 200;
- // adjust line_offset_ too
- solid_line_offset_ = 1 + solid_line_thickness_ / 2;
- }
- if (lyxrc.zoom >= 100) {
- // derive the line thickness from zoom factor
- // the zoom is given in percent
- // (increase thickness at 150%, 250% etc.)
- dotted_line_thickness_ = (lyxrc.zoom + 50) / 100;
- }
-
x_ = row_.left_margin + xo_;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
return;
int const desc = e.inset ? e.dim.descent() : 0;
- int const y = yo_ + solid_line_offset_ + desc + solid_line_thickness_ / 2;
+ int const y = yo_ + pi_.base.solidLineOffset()
+ + desc + pi_.base.solidLineThickness() / 2;
pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
- Painter::line_solid, solid_line_thickness_);
+ Painter::line_solid, pi_.base.solidLineThickness());
}
// to avoid drawing at the same vertical offset
FontMetrics const & fm = theFontMetrics(e.font);
int const thickness = max(fm.lineWidth(), 2);
- int const y = yo_ + solid_line_offset_ + solid_line_thickness_
- + (e.change.changed() ? solid_line_thickness_ + 1 : 0)
+ int const y = yo_ + pi_.base.solidLineOffset() + pi_.base.solidLineThickness()
+ + (e.change.changed() ? pi_.base.solidLineThickness() + 1 : 0)
+ 1 + thickness / 2;
//FIXME: this could be computed only once, it is probably not costly.
if (x1 > x2)
swap(x1, x2);
- pi_.pain.line(x_ + x1, y, x_ + x2, y, Color_error,
+ pi_.pain.line(int(x_ + x1), y, int(x_ + x2), y,
+ Color_error,
Painter::line_onoffdash, thickness);
pos = range.last + 1;
}
void RowPainter::paintChange(Row::Element const & e) const
{
- if (!e.change.changed())
- return;
- // Calculate 1/3 height of font
- FontMetrics const & fm = theFontMetrics(e.font);
- int const y_bar = e.change.deleted() ? yo_ - fm.maxAscent() / 3
- : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
- pi_.pain.line(int(x_), y_bar, int(x_ + e.full_width()), y_bar,
- e.change.color(), Painter::line_solid, solid_line_thickness_);
+ e.change.paintCue(pi_, x_, yo_, x_ + e.full_width(), e.font.fontInfo());
}
void RowPainter::paintTooLargeMarks(bool const left, bool const right) const
{
if (left)
- pi_.pain.line(dotted_line_thickness_, yo_ - row_.ascent(),
- dotted_line_thickness_, yo_ + row_.descent(),
- Color_scroll,
- Painter::line_onoffdash, dotted_line_thickness_);
+ pi_.pain.line(pi_.base.dottedLineThickness(), yo_ - row_.ascent(),
+ pi_.base.dottedLineThickness(), yo_ + row_.descent(),
+ Color_scroll, Painter::line_onoffdash,
+ pi_.base.dottedLineThickness());
if (right) {
- int const wwidth = pi_.base.bv->workWidth() - dotted_line_thickness_;
+ int const wwidth =
+ pi_.base.bv->workWidth() - pi_.base.dottedLineThickness();
pi_.pain.line(wwidth, yo_ - row_.ascent(),
wwidth, yo_ + row_.descent(),
- Color_scroll,
- Painter::line_onoffdash, dotted_line_thickness_);
+ Color_scroll, Painter::line_onoffdash,
+ pi_.base.dottedLineThickness());
}
}
void RowPainter::paintLabel() const
{
- docstring const str = par_.labelString();
+ docstring const & str = par_.labelString();
if (str.empty())
return;
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
- int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
- int x = is_rtl ? nestMargin() + changebarMargin()
- : max_row_width - row_.right_margin;
// If needed, move the box a bit to avoid overlapping with text.
- int const rem = max_row_width - row_.width();
- if (rem <= 0)
- x += is_rtl ? rem : - rem;
+ int x = 0;
+ if (is_rtl) {
+ 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
+ - size - Inset::TEXT_TO_INSET_OFFSET;
+ x = max(normal_x, row_.width());
+ }
if (endlabel == END_LABEL_BOX)
pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
for ( ; cit != end ; ++cit) {
Row::Element const & e = *cit;
if (e.type == Row::INSET) {
- // If outer row has changed, nested insets are repainted completely.
- // FIXME: check what this really does. The test is weird.
- bool const nested_inset =
- (e.inset->asInsetMath() && !e.inset->asInsetMath()->asMacroTemplate())
- || e.inset->asInsetText() || e.inset->asInsetTabular();
- if (nested_inset)
- paintInset(e);
+ paintInset(e);
+ // The line that indicates word in a different language
+ paintForeignMark(e);
+ // change tracking (not for insets that handle it themselves)
+ if (!e.inset->canPaintChange(*pi_.base.bv))
+ paintChange(e);
}
+
x_ += e.full_width();
}
}
// The line that indicates word in a different language
paintForeignMark(e);
- // change tracking (not for insets that track their own changes)
- if (e.type != Row::INSET || ! e.inset->canTrackChanges())
+ // change tracking (not for insets that handle it themselves)
+ if (e.type != Row::INSET || ! e.inset->canPaintChange(*pi_.base.bv))
paintChange(e);
x_ += e.full_width();
{
if (!row_.selection())
return;
- Cursor const & curs = pi_.base.bv->cursor();
- DocIterator beg = curs.selectionBegin();
- beg.pit() = row_.pit();
- beg.pos() = row_.sel_beg;
-
- DocIterator end = curs.selectionEnd();
- end.pit() = row_.pit();
- end.pos() = row_.sel_end;
-
- bool const begin_boundary = beg.pos() >= row_.endpos();
- bool const end_boundary = row_.sel_end == row_.endpos();
-
- DocIterator cur = beg;
- cur.boundary(begin_boundary);
- int x1 = text_metrics_.cursorX(beg.top(), begin_boundary);
- int x2 = text_metrics_.cursorX(end.top(), end_boundary);
+
int const y1 = yo_ - row_.ascent();
int const y2 = y1 + row_.height();
-
- int const rm = text_.isMainText() ? pi_.base.bv->rightMargin() : 0;
- int const lm = text_.isMainText() ? pi_.base.bv->leftMargin() : 0;
+ bool const rtl = text_.isRTL(par_);
// draw the margins
- if (row_.begin_margin_sel) {
- if (text_.isRTL(beg.paragraph())) {
- pi_.pain.fillRectangle(int(xo_ + x1), y1,
- text_metrics_.width() - rm - x1, y2 - y1, Color_selection);
- } else {
- pi_.pain.fillRectangle(int(xo_ + lm), y1, x1 - lm, y2 - y1,
- Color_selection);
- }
- }
-
- if (row_.end_margin_sel) {
- if (text_.isRTL(beg.paragraph())) {
- pi_.pain.fillRectangle(int(xo_ + lm), y1, x2 - lm, y2 - y1,
- Color_selection);
- } else {
- pi_.pain.fillRectangle(int(xo_ + x2), y1, text_metrics_.width() - rm - x2,
- y2 - y1, Color_selection);
- }
- }
-
- // if we are on a boundary from the beginning, it's probably
- // a RTL boundary and we jump to the other side directly as this
- // segement is 0-size and confuses the logic below
- if (cur.boundary())
- cur.boundary(false);
+ if (rtl ? 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
- while (cur < end) {
- bool draw_now = false;
-
- // simplified cursorForward code below which does not
- // descend into insets and which does not go into the
- // next line. Compare the logic with the original cursorForward
-
- // if left of boundary -> just jump to right side, but
- // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
- if (cur.boundary()) {
- cur.boundary(false);
- } else if (text_metrics_.isRTLBoundary(cur.pit(), cur.pos() + 1)) {
- // in front of RTL boundary -> Stay on this side of the boundary
- // because: ab|cDDEEFFghi -> abc|DDEEFFghi
- ++cur.pos();
- cur.boundary(true);
- draw_now = true;
- } else {
- // move right
- ++cur.pos();
-
- // line end?
- if (cur.pos() == row_.endpos())
- cur.boundary(true);
- }
-
- if (x1 == -1) {
- // the previous segment was just drawn, now the next starts
- x1 = text_metrics_.cursorX(cur.top(), cur.boundary());
+ 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)
+ || pi_.selected;
+ // all the text 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) {
+ // 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);
+ double x1 = e.pos2x(from);
+ double x2 = e.pos2x(to);
+ if (x1 > x2)
+ swap(x1, x2);
+ pi_.pain.fillRectangle(int(x + x1), y1, int(x2 - x1), y2 - y1,
+ Color_selection);
}
+ x += e.full_width();
+ }
- if (!(cur < end) || draw_now) {
- x2 = text_metrics_.cursorX(cur.top(), cur.boundary());
- pi_.pain.fillRectangle(int(xo_ + min(x1, x2)), y1, abs(x2 - x1),
- y2 - y1, Color_selection);
+ if (rtl ? row_.begin_margin_sel : row_.end_margin_sel)
+ pi_.pain.fillRectangle(int(x), y1,
+ int(xo_ + text_metrics_.width()) - int(x), y2 - y1,
+ Color_selection);
- // reset x1, so it is set again next round (which will be on the
- // right side of a boundary or at the selection end)
- x1 = -1;
- }
- }
}
projects / lyx.git / blobdiff