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)
+ dotted_line_thickness_(1)
{
if (lyxrc.zoom >= 200) {
// 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_;
inset->drawSelection(pi_, x1, yo_);
inset->draw(pi_, x1, yo_);
- Dimension const & dim = pm_.insetDimension(inset);
+ Dimension const & dim = pi_.base.bv->coordCache().insets().dim(inset);
paintForeignMark(x_, font.language(), dim.descent());
}
-void RowPainter::paintSeparator(double width, Font const & font)
-{
- pi_.pain.textDecoration(font.fontInfo(), int(x_), yo_, int(width));
- x_ += width;
-}
-
-
void RowPainter::paintForeignMark(double orig_x, Language const * lang, int desc) const
{
if (!lyxrc.mark_foreign_language)
void RowPainter::paintMisspelledMark(double const orig_x,
- docstring const & str, Font const & font,
- pos_type const start_pos,
- bool const changed) const
+ 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_
- + (changed ? solid_line_thickness_ + 1 : 0)
- + dotted_line_offset_;
+ + (e.change.changed() ? solid_line_thickness_ + 1 : 0)
+ + 1 + thickness / 2;
//FIXME: this could be computed only once, it is probably not costly.
// check for cursor position
--cpos;
}
- pos_type pos = start_pos;
- while (pos < start_pos + pos_type(str.length())) {
+ pos_type pos = e.pos;
+ while (pos < e.pos + pos_type(e.str.length())) {
if (!par_.isMisspelled(pos)) {
++pos;
continue;
continue;
}
- FontMetrics const & fm = theFontMetrics(font);
- int x1 = fm.pos2x(str, range.first - start_pos,
- font.isVisibleRightToLeft());
- int x2 = fm.pos2x(str, min(range.last - start_pos + 1,
- pos_type(str.length())),
- font.isVisibleRightToLeft());
+ FontMetrics const & fm = theFontMetrics(e.font);
+ int x1 = fm.pos2x(e.str, range.first - e.pos,
+ e.isRTL(), e.extra);
+ int x2 = fm.pos2x(e.str, min(range.last - e.pos + 1,
+ pos_type(e.str.length())),
+ 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_);
+ Painter::line_onoffdash, thickness);
pos = range.last + 1;
}
}
-void RowPainter::paintStringAndSel(docstring const & str, Font const & font,
- Change const & change,
- pos_type start_pos, pos_type end_pos)
+void RowPainter::paintStringAndSel(Row::Element const & e)
{
// at least part of text selected?
- bool const some_sel = (end_pos >= row_.sel_beg && start_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 = (start_pos >= row_.sel_beg && end_pos < row_.sel_end)
+ bool const all_sel = (e.pos >= row_.sel_beg && e.endpos < row_.sel_end)
|| pi_.selected;
- if (all_sel) {
- Font copy = font;
- copy.fontInfo().setPaintColor(Color_selectiontext);
- x_ += pi_.pain.text(int(x_), yo_, str, copy);
- } else if (change.changed()) {
- Font copy = font;
- copy.fontInfo().setPaintColor(change.color());
- x_ += pi_.pain.text(int(x_), yo_, str, copy);
+ if (all_sel || e.change.changed()) {
+ Font copy = e.font;
+ 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);
} else if (!some_sel) {
- x_ += pi_.pain.text(int(x_), yo_, str, font);
+ pi_.pain.text(int(x_), yo_, e.str, e.font, e.extra);
} else {
- x_ += pi_.pain.text(int(x_), yo_, str, font, Color_selectiontext,
- max(row_.sel_beg, start_pos) - start_pos,
- min(row_.sel_end, end_pos) - start_pos);
+ 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);
}
+ x_ += e.full_width();
}
}
-int RowPainter::paintAppendixStart(int y) const
+void RowPainter::paintAppendixStart(int y) const
{
FontInfo pb_font = sane_font;
pb_font.setColor(Color_appendix);
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::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();
//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();
- }
}
FontMetrics const & fm = theFontMetrics(font);
double x = x_;
- if (is_rtl) {
- x = width_ - row_.left_margin
- + fm.width(layout.labelsep);
- } else {
- x = x_ - fm.width(layout.labelsep)
- - fm.width(str);
- }
+ if (is_rtl)
+ x = width_ - row_.right_margin + fm.width(layout.labelsep);
+ else
+ x = x_ - fm.width(layout.labelsep) - fm.width(str);
pi_.pain.text(int(x), yo_, str, font);
}
double x = x_;
if (layout.labeltype == LABEL_CENTERED) {
- if (is_rtl)
- x = row_.left_margin;
- x += (width_ - text_metrics_.rightMargin(pm_) - row_.left_margin) / 2;
+ x = row_.left_margin + (width_ - row_.left_margin - row_.right_margin) / 2;
x -= fm.width(str) / 2;
} else if (is_rtl) {
- x = width_ - row_.left_margin - fm.width(str);
+ x = width_ - row_.right_margin - fm.width(str);
}
pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
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 - text_metrics_.rightMargin(pm_);
+ : 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();
void RowPainter::paintOnlyInsets()
{
- CoordCache const & cache = pi_.base.bv->coordCache();
- pos_type const end = row_.endpos();
- for (pos_type pos = row_.pos(); pos != end; ++pos) {
- // If outer row has changed, nested insets are repaint completely.
- Inset const * inset = par_.getInset(pos);
- bool const nested_inset = inset &&
- ((inset->asInsetMath() &&
- !inset->asInsetMath()->asMacroTemplate())
- || inset->asInsetText()
- || inset->asInsetTabular());
- if (!nested_inset)
- continue;
- if (x_ > pi_.base.bv->workWidth()
- || !cache.getInsets().has(inset))
- continue;
- x_ = cache.getInsets().x(inset);
- Font const font = text_metrics_.displayFont(pit_, pos);
- paintInset(inset, font, par_.lookupChange(pos), pos);
+ Row::const_iterator cit = row_.begin();
+ Row::const_iterator const & end = row_.end();
+ for ( ; cit != end ; ++cit) {
+ 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_);
+ 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;
+ }
+ double orig_x = x_;
+ paintInset(e.inset, e.font, e.change, e.pos);
+ // The line that indicates word in a different language
+ paintForeignMark(orig_x, e.font.language(), e.dim.descent());
+ // change tracking (not for insets that handle it themselves)
+ if (! e.inset->canTrackChanges())
+ paintChange(orig_x, e.font, e.change);
+ } else
+ x_ += e.full_width();
}
}
+
void RowPainter::paintText()
{
Row::const_iterator cit = row_.begin();
switch (e.type) {
case Row::STRING:
case Row::VIRTUAL:
- paintStringAndSel(e.str, e.font, e.change, e.pos, e.endpos);
+ paintStringAndSel(e);
- // Paint the spelling mark if needed.
- if (lyxrc.spellcheck_continuously && pi_.do_spellcheck
- && par_.isMisspelled(e.pos)) {
- paintMisspelledMark(orig_x, e.str, e.font, e.pos, e.change.changed());
- }
+ // Paint the spelling marks if enabled.
+ if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && pi_.pain.isDrawingEnabled())
+ paintMisspelledMark(orig_x, e);
break;
case Row::INSET: {
// If outer row has changed, nested insets are repaint completely.
foreign_descent = e.dim.descent();
}
break;
- case Row::SEPARATOR:
case Row::SPACE:
- paintSeparator(e.full_width(), e.font);
+ 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
projects / lyx.git / blobdiff