X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.cpp;h=1c48b5bb348bd1dadc8bbeb6afc421a160ac9931;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=40d2618b175dfbcde42258d1627e2d2554d93b76;hpb=77ef48d093d08ef3491e4f00a994f9709b41ccf2;p=lyx.git diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp index 40d2618b17..1c48b5bb34 100644 --- a/src/RowPainter.cpp +++ b/src/RowPainter.cpp @@ -45,6 +45,8 @@ #include "support/lassert.h" #include +#include + using namespace std; namespace lyx { @@ -54,38 +56,21 @@ using frontend::FontMetrics; RowPainter::RowPainter(PainterInfo & pi, - Text const & text, pit_type pit, Row const & row, int x, int y) + Text const & text, Row const & row, int x, int y) : pi_(pi), text_(text), text_metrics_(pi_.base.bv->textMetrics(&text)), pars_(text.paragraphs()), - row_(row), pit_(pit), par_(text.paragraphs()[pit]), - pm_(text_metrics_.parMetrics(pit)), change_(pi_.change_), - xo_(x), yo_(y), width_(text_metrics_.width()), - solid_line_thickness_(1), solid_line_offset_(1), - dotted_line_thickness_(1) + row_(row), par_(text.paragraphs()[row.pit()]), + pm_(text_metrics_.parMetrics(row.pit())), change_(pi_.change_), + 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; //row_.dump(); - LBUFERR(pit >= 0); - LBUFERR(pit < int(text.paragraphs().size())); + LBUFERR(row.pit() >= 0); + LBUFERR(row.pit() < int(text.paragraphs().size())); } @@ -104,7 +89,7 @@ FontInfo RowPainter::labelFont() const // This draws green lines around each inset. -void RowPainter::paintInset(Row::Element const & e) +void RowPainter::paintInset(Row::Element const & e) const { // Handle selection bool const pi_selected = pi_.selected; @@ -135,12 +120,6 @@ void RowPainter::paintInset(Row::Element const & e) e.inset->drawSelection(pi_, x1, yo_); e.inset->draw(pi_, x1, yo_); - Dimension const & dim = pi_.base.bv->coordCache().insets().dim(e.inset); - - paintForeignMark(x_, e.font.language(), dim.descent()); - - x_ += dim.width(); - // Restore full_repaint status. pi_.full_repaint = pi_full_repaint; pi_.change_ = pi_change; @@ -148,6 +127,7 @@ void RowPainter::paintInset(Row::Element const & e) pi_.selected = pi_selected; #ifdef DEBUG_METRICS + Dimension const & dim = pi_.base.bv->coordCache().insets().dim(e.inset); int const x2 = x1 + dim.wid; int const y1 = yo_ + dim.des; int const y2 = yo_ - dim.asc; @@ -159,8 +139,9 @@ void RowPainter::paintInset(Row::Element const & e) } -void RowPainter::paintForeignMark(double orig_x, Language const * lang, int desc) const +void RowPainter::paintForeignMark(Row::Element const & e) const { + Language const * lang = e.font.language(); if (!lyxrc.mark_foreign_language) return; if (lang == latex_language) @@ -168,21 +149,22 @@ void RowPainter::paintForeignMark(double orig_x, Language const * lang, int desc if (lang == pi_.base.bv->buffer().params().language) return; - int const y = yo_ + solid_line_offset_ + desc + solid_line_thickness_ / 2; - pi_.pain.line(int(orig_x), y, int(x_), y, Color_language, - Painter::line_solid, solid_line_thickness_); + int const desc = e.inset ? e.dim.descent() : 0; + 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, pi_.base.solidLineThickness()); } -void RowPainter::paintMisspelledMark(double const orig_x, - Row::Element const & e) const +void RowPainter::paintMisspelledMark(Row::Element const & e) const { // if changed the misspelled marker gets placed slightly lower than normal // 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. @@ -224,7 +206,7 @@ void RowPainter::paintMisspelledMark(double const orig_x, if (x1 > x2) swap(x1, x2); - pi_.pain.line(int(orig_x) + x1, y, int(orig_x) + x2, y, + pi_.pain.line(int(x_ + x1), y, int(x_ + x2), y, Color_error, Painter::line_onoffdash, thickness); pos = range.last + 1; @@ -232,7 +214,7 @@ void RowPainter::paintMisspelledMark(double const orig_x, } -void RowPainter::paintStringAndSel(Row::Element const & e) +void RowPainter::paintStringAndSel(Row::Element const & e) const { // at least part of text selected? bool const some_sel = (e.endpos >= row_.sel_beg && e.pos < row_.sel_end) @@ -246,29 +228,21 @@ void RowPainter::paintStringAndSel(Row::Element const & e) Color const col = e.change.changed() ? e.change.color() : Color_selectiontext; copy.fontInfo().setPaintColor(col); - pi_.pain.text(int(x_), yo_, e.str, copy, e.extra); + pi_.pain.text(int(x_), yo_, e.str, copy, e.extra, e.full_width()); } else if (!some_sel) { - pi_.pain.text(int(x_), yo_, e.str, e.font, e.extra); + pi_.pain.text(int(x_), yo_, e.str, e.font, e.extra, e.full_width()); } else { pi_.pain.text(int(x_), yo_, e.str, e.font, Color_selectiontext, - max(row_.sel_beg, e.pos) - e.pos, - min(row_.sel_end, e.endpos) - e.pos, e.extra); + max(row_.sel_beg, e.pos) - e.pos, + min(row_.sel_end, e.endpos) - e.pos, + e.extra, e.full_width()); } - x_ += e.full_width(); } -void RowPainter::paintChange(double orig_x, Font const & font, - Change const & change) const +void RowPainter::paintChange(Row::Element const & e) const { - if (!change.changed()) - return; - // Calculate 1/3 height of font - FontMetrics const & fm = theFontMetrics(font); - int const y_bar = change.deleted() ? yo_ - fm.maxAscent() / 3 - : yo_ + 2 * solid_line_offset_ + solid_line_thickness_; - pi_.pain.line(int(orig_x), y_bar, int(x_), y_bar, - change.color(), Painter::line_solid, solid_line_thickness_); + e.change.paintCue(pi_, x_, yo_, x_ + e.full_width(), e.font.fontInfo()); } @@ -286,7 +260,7 @@ void RowPainter::paintChangeBar() const if (start == end || !par_.isChanged(start, end)) return; - int const height = text_metrics_.isLastRow(pit_, row_) + int const height = text_metrics_.isLastRow(row_) ? row_.ascent() : row_.height(); @@ -318,16 +292,16 @@ void RowPainter::paintDepthBar() const return; depth_type prev_depth = 0; - if (!text_metrics_.isFirstRow(pit_, row_)) { - pit_type pit2 = pit_; + if (!text_metrics_.isFirstRow(row_)) { + pit_type pit2 = row_.pit(); if (row_.pos() == 0) --pit2; prev_depth = pars_[pit2].getDepth(); } depth_type next_depth = 0; - if (!text_metrics_.isLastRow(pit_, row_)) { - pit_type pit2 = pit_; + if (!text_metrics_.isLastRow(row_)) { + pit_type pit2 = row_.pit(); if (row_.endpos() >= pars_[pit2].size()) ++pit2; next_depth = pars_[pit2].getDepth(); @@ -379,16 +353,17 @@ void RowPainter::paintAppendixStart(int y) const 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()); } } @@ -402,7 +377,7 @@ void RowPainter::paintFirst() const paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight()); bool const is_first = - text_.isFirstInSequence(pit_) || !layout.isParagraphGroup(); + text_.isFirstInSequence(row_.pit()) || !layout.isParagraphGroup(); //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl; if (layout.labelIsInline() @@ -415,7 +390,7 @@ void RowPainter::paintFirst() const void RowPainter::paintLabel() const { - docstring const str = par_.labelString(); + docstring const & str = par_.labelString(); if (str.empty()) return; @@ -503,10 +478,10 @@ static int getEndLabel(pit_type p, Text const & text) } -void RowPainter::paintLast() +void RowPainter::paintLast() const { bool const is_rtl = text_.isRTL(par_); - int const endlabel = getEndLabel(pit_, text_); + int const endlabel = getEndLabel(row_.pit(), text_); // paint imaginary end-of-paragraph character @@ -577,16 +552,14 @@ void RowPainter::paintOnlyInsets() 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) { - x_ += e.full_width(); - continue; - } - paintInset(e); - } else - x_ += e.full_width(); + if (nested_inset) + paintInset(e); + } + x_ += e.full_width(); } } @@ -596,9 +569,7 @@ void RowPainter::paintText() Row::const_iterator cit = row_.begin(); Row::const_iterator const & end = row_.end(); for ( ; cit != end ; ++cit) { - double const orig_x = x_; Row::Element const & e = *cit; - int foreign_descent = 0; switch (e.type) { case Row::STRING: @@ -607,25 +578,25 @@ void RowPainter::paintText() // Paint the spelling marks if enabled. if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && pi_.pain.isDrawingEnabled()) - paintMisspelledMark(orig_x, e); + paintMisspelledMark(e); break; - case Row::INSET: { - // If outer row has changed, nested insets are repainted completely. + + case Row::INSET: paintInset(e); - foreign_descent = e.dim.descent(); - } break; + case Row::SPACE: pi_.pain.textDecoration(e.font.fontInfo(), int(x_), yo_, int(e.full_width())); - x_ += e.full_width(); } // The line that indicates word in a different language - paintForeignMark(orig_x, e.font.language(), foreign_descent); + paintForeignMark(e); + + // change tracking (not for insets that handle it themselves) + if (e.type != Row::INSET || ! e.inset->canPaintChange(*pi_.base.bv)) + paintChange(e); - // change tracking (not for insets that track their own changes) - if (e.type != Row::INSET || ! e.inset->canTrackChanges()) - paintChange(orig_x, e.font, e.change); + x_ += e.full_width(); } } @@ -636,11 +607,11 @@ void RowPainter::paintSelection() const return; Cursor const & curs = pi_.base.bv->cursor(); DocIterator beg = curs.selectionBegin(); - beg.pit() = pit_; + beg.pit() = row_.pit(); beg.pos() = row_.sel_beg; DocIterator end = curs.selectionEnd(); - end.pit() = pit_; + end.pit() = row_.pit(); end.pos() = row_.sel_end; bool const begin_boundary = beg.pos() >= row_.endpos();