X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.cpp;h=5b3e6472eddcbae55ca2362e678b32bfdfc368c8;hb=aef8746712ccc64f1f10073fe6d011ff1d7eb4a4;hp=f54cf2853bb6919e2e7893375d75edbdf600c2ec;hpb=4ede231ef1d995a364b2d16d3d038c4aa29a4544;p=lyx.git diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp index f54cf2853b..5b3e6472ed 100644 --- a/src/RowPainter.cpp +++ b/src/RowPainter.cpp @@ -54,40 +54,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), dotted_line_offset_(2) + 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; - // adjust line_offset_ too - dotted_line_offset_ = 1 + dotted_line_thickness_ / 2; - } - 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())); } @@ -106,44 +87,36 @@ FontInfo RowPainter::labelFont() const // This draws green lines around each inset. -void RowPainter::paintInset(Inset const * inset, Font const & font, - Change const & change, - pos_type const pos) +void RowPainter::paintInset(Row::Element const & e) const { // Handle selection bool const pi_selected = pi_.selected; Cursor const & cur = pi_.base.bv->cursor(); if (cur.selection() && cur.text() == &text_ && cur.normalAnchor().text() == &text_) - pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos; + pi_.selected = row_.sel_beg <= e.pos && row_.sel_end > e.pos; - LASSERT(inset, return); + LASSERT(e.inset, return); // Backup full_repaint status because some insets (InsetTabular) // requires a full repaint bool const pi_full_repaint = pi_.full_repaint; bool const pi_do_spellcheck = pi_.do_spellcheck; Change const pi_change = pi_.change_; - pi_.base.font = inset->inheritFont() ? font.fontInfo() : + pi_.base.font = e.inset->inheritFont() ? e.font.fontInfo() : pi_.base.bv->buffer().params().getFont().fontInfo(); - pi_.ltr_pos = !font.isVisibleRightToLeft(); - pi_.change_ = change_.changed() ? change_ : change; - pi_.do_spellcheck &= inset->allowSpellCheck(); + pi_.ltr_pos = !e.font.isVisibleRightToLeft(); + pi_.change_ = change_.changed() ? change_ : e.change; + pi_.do_spellcheck &= e.inset->allowSpellCheck(); int const x1 = int(x_); - pi_.base.bv->coordCache().insets().add(inset, x1, yo_); + pi_.base.bv->coordCache().insets().add(e.inset, x1, yo_); // insets are painted completely. Recursive // FIXME: it is wrong to completely paint the background // if we want to do single row painting. - inset->drawBackground(pi_, x1, yo_); - inset->drawSelection(pi_, x1, yo_); - inset->draw(pi_, x1, yo_); - - Dimension const & dim = pm_.insetDimension(inset); - - paintForeignMark(x_, font.language(), dim.descent()); - - x_ += dim.width(); + e.inset->drawBackground(pi_, x1, yo_); + e.inset->drawSelection(pi_, x1, yo_); + e.inset->draw(pi_, x1, yo_); // Restore full_repaint status. pi_.full_repaint = pi_full_repaint; @@ -152,6 +125,7 @@ void RowPainter::paintInset(Inset const * inset, Font const & font, 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; @@ -163,8 +137,9 @@ void RowPainter::paintInset(Inset const * inset, Font const & font, } -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) @@ -172,20 +147,23 @@ 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 - int const y = yo_ + solid_line_offset_ + solid_line_thickness_ - + (e.change.changed() ? solid_line_thickness_ + 1 : 0) - + dotted_line_offset_; + FontMetrics const & fm = theFontMetrics(e.font); + int const thickness = max(fm.lineWidth(), 2); + 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. // check for cursor position @@ -219,22 +197,21 @@ void RowPainter::paintMisspelledMark(double const orig_x, FontMetrics const & fm = theFontMetrics(e.font); int x1 = fm.pos2x(e.str, range.first - e.pos, - e.font.isVisibleRightToLeft(), e.extra); + e.isRTL(), e.extra); int x2 = fm.pos2x(e.str, min(range.last - e.pos + 1, pos_type(e.str.length())), - e.font.isVisibleRightToLeft(), e.extra); + e.isRTL(), e.extra); if (x1 > x2) swap(x1, x2); - pi_.pain.line(int(orig_x) + x1, y, int(orig_x) + x2, y, - Color_error, - Painter::line_onoffdash, dotted_line_thickness_); + pi_.pain.line(x_ + x1, y, x_ + x2, y, Color_error, + Painter::line_onoffdash, thickness); pos = range.last + 1; } } -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) @@ -243,36 +220,26 @@ void RowPainter::paintStringAndSel(Row::Element const & e) bool const all_sel = (e.pos >= row_.sel_beg && e.endpos < row_.sel_end) || pi_.selected; - if (all_sel) { + if (all_sel || e.change.changed()) { Font copy = e.font; - copy.fontInfo().setPaintColor(Color_selectiontext); - pi_.pain.text(int(x_), yo_, e.str, copy, e.extra); - } else if (e.change.changed()) { - Font copy = e.font; - copy.fontInfo().setPaintColor(e.change.color()); - pi_.pain.text(int(x_), yo_, e.str, copy, e.extra); + 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, 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()); } @@ -290,7 +257,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(); @@ -322,16 +289,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(); @@ -357,7 +324,7 @@ void RowPainter::paintDepthBar() const } -int RowPainter::paintAppendixStart(int y) const +void RowPainter::paintAppendixStart(int y) const { FontInfo pb_font = sane_font; pb_font.setColor(Color_appendix); @@ -377,64 +344,44 @@ int RowPainter::paintAppendixStart(int y) const 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); - - return 3 * defaultRowHeight(); } 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::paintFirst() const { - BufferParams const & bparams = pi_.base.bv->buffer().params(); Layout const & layout = par_.layout(); - int y_top = 0; - // start of appendix? if (par_.params().startOfAppendix()) - y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight()); - - if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation - && pit_ != 0) { - if (layout.latextype == LATEX_PARAGRAPH - && !par_.getDepth()) { - y_top += bparams.getDefSkip().inPixels(*pi_.base.bv); - } else { - Layout const & playout = pars_[pit_ - 1].layout(); - if (playout.latextype == LATEX_PARAGRAPH - && !pars_[pit_ - 1].getDepth()) { - // is it right to use defskip here, too? (AS) - y_top += bparams.getDefSkip().inPixels(*pi_.base.bv); - } - } - } + 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() - && (layout.labeltype != LABEL_STATIC || is_first)) { + && (layout.labeltype != LABEL_STATIC || is_first)) paintLabel(); - } else if (is_first && layout.labelIsAbove()) { + else if (is_first && layout.labelIsAbove()) paintTopLevelLabel(); - } } @@ -528,10 +475,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 @@ -602,17 +549,14 @@ void RowPainter::paintOnlyInsets() Row::Element const & e = *cit; if (e.type == Row::INSET) { // If outer row has changed, nested insets are repainted completely. - pi_.base.bv->coordCache().insets().add(e.inset, int(x_), yo_); + // 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.inset, e.font, e.change, e.pos); - } else - x_ += e.full_width(); + if (nested_inset) + paintInset(e); + } + x_ += e.full_width(); } } @@ -622,9 +566,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: @@ -632,27 +574,26 @@ void RowPainter::paintText() paintStringAndSel(e); // Paint the spelling marks if enabled. - if (lyxrc.spellcheck_continuously && pi_.do_spellcheck) - paintMisspelledMark(orig_x, e); + if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && pi_.pain.isDrawingEnabled()) + paintMisspelledMark(e); break; - case Row::INSET: { - // If outer row has changed, nested insets are repaint completely. - pi_.base.bv->coordCache().insets().add(e.inset, int(x_), yo_); - paintInset(e.inset, e.font, e.change, e.pos); - foreign_descent = e.dim.descent(); - } + + case Row::INSET: + paintInset(e); 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(); } } @@ -663,11 +604,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();