#include "rowpainter.h"
-#include "Bidi.h"
#include "Buffer.h"
#include "CoordCache.h"
#include "Cursor.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Changes.h"
-#include "Encoding.h"
#include "Language.h"
#include "Layout.h"
#include "LyXRC.h"
#include "insets/InsetText.h"
+#include "mathed/InsetMath.h"
+
#include "support/debug.h"
#include "support/gettext.h"
#include "support/textutils.h"
using frontend::Painter;
using frontend::FontMetrics;
+
RowPainter::RowPainter(PainterInfo & pi,
- Text const & text, pit_type pit, Row const & row, Bidi & bidi, int x, int y)
+ Text const & text, pit_type pit, 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)),
- bidi_(bidi), change_(pi_.change_),
- xo_(x), yo_(y), width_(text_metrics_.width())
+ pm_(text_metrics_.parMetrics(pit)), change_(pi_.change_),
+ xo_(x), yo_(y), width_(text_metrics_.width()),
+ solid_line_thickness_(1.0), solid_line_offset_(1),
+ dotted_line_thickness_(1.0), dotted_line_offset_(2)
{
bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
+
+ 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_ = (float)(int((lyxrc.zoom + 50) / 200.0));
+ // adjust line_offset_ too
+ solid_line_offset_ = 1 + int(0.5 * solid_line_thickness_);
+ }
+ 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_ = (float)(int((lyxrc.zoom + 50) / 100.0));
+ // adjust line_offset_ too
+ dotted_line_offset_ = int(0.5 * dotted_line_thickness_) + 1;
+ }
+
x_ = row_.x + xo_;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
//row_.dump();
- LASSERT(pit >= 0, /**/);
- LASSERT(pit < int(text.paragraphs().size()), /**/);
+ LBUFERR(pit >= 0);
+ LBUFERR(pit < int(text.paragraphs().size()));
}
// requires a full repaint
bool pi_full_repaint = pi_.full_repaint;
- // FIXME: We should always use font, see documentation of
- // noFontChange() in Inset.h.
- pi_.base.font = inset->noFontChange() ?
- pi_.base.bv->buffer().params().getFont().fontInfo() :
- font.fontInfo();
+ pi_.base.font = inset->inheritFont() ? font.fontInfo() :
+ pi_.base.bv->buffer().params().getFont().fontInfo();
pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
+ Change prev_change = change_;
pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos);
int const x1 = int(x_);
pi_.base.bv->coordCache().insets().add(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_);
// Restore full_repaint status.
pi_.full_repaint = pi_full_repaint;
+ pi_.change_ = prev_change;
#ifdef DEBUG_METRICS
int const x2 = x1 + dim.wid;
}
-void RowPainter::paintHebrewComposeChar(pos_type & vpos, FontInfo const & font)
-{
- pos_type pos = bidi_.vis2log(vpos);
-
- docstring str;
-
- // first char
- char_type c = par_.getChar(pos);
- str += c;
- ++vpos;
-
- int const width = theFontMetrics(font).width(c);
- int dx = 0;
-
- for (pos_type i = pos - 1; i >= 0; --i) {
- c = par_.getChar(i);
- if (!Encodings::isHebrewComposeChar(c)) {
- if (isPrintableNonspace(c)) {
- int const width2 = pm_.singleWidth(i,
- text_metrics_.displayFont(pit_, i));
- dx = (c == 0x05e8 || // resh
- c == 0x05d3) // dalet
- ? width2 - width
- : (width2 - width) / 2;
- }
- break;
- }
- }
-
- // Draw nikud
- pi_.pain.text(int(x_) + dx, yo_, str, font);
-}
-
-
-void RowPainter::paintArabicComposeChar(pos_type & vpos, FontInfo const & font)
-{
- pos_type pos = bidi_.vis2log(vpos);
- docstring str;
-
- // first char
- char_type c = par_.getChar(pos);
- c = par_.transformChar(c, pos);
- str += c;
- ++vpos;
-
- int const width = theFontMetrics(font).width(c);
- int dx = 0;
-
- for (pos_type i = pos - 1; i >= 0; --i) {
- c = par_.getChar(i);
- if (!Encodings::isArabicComposeChar(c)) {
- if (isPrintableNonspace(c)) {
- int const width2 = pm_.singleWidth(i,
- text_metrics_.displayFont(pit_, i));
- dx = (width2 - width) / 2;
- }
- break;
- }
- }
- // Draw nikud
- pi_.pain.text(int(x_) + dx, yo_, str, font);
-}
-
-
-void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
- bool hebrew, bool arabic)
+void RowPainter::paintChars(pos_type & vpos, Font const & font)
{
// This method takes up 70% of time when typing
pos_type pos = bidi_.vis2log(vpos);
+ pos_type start_pos = pos;
// first character
- vector<char_type> str;
+ char_type c = par_.getChar(pos);
+ docstring str;
str.reserve(100);
- str.push_back(par_.getChar(pos));
- if (arabic) {
- char_type c = str[0];
+ // special case for arabic
+ string const & lang = font.language()->lang();
+ bool const swap_paren = lang == "arabic_arabtex"
+ || lang == "arabic_arabi"
+ || lang == "farsi";
+
+ // FIXME: Why only round brackets and why the difference to
+ // Hebrew? See also Paragraph::getUChar
+ if (swap_paren) {
if (c == '(')
c = ')';
else if (c == ')')
c = '(';
- str[0] = par_.transformChar(c, pos);
}
+ str.push_back(c);
pos_type const end = row_.endpos();
FontSpan const font_span = par_.fontSpan(pos);
// Track-change status.
Change const & change_running = par_.lookupChange(pos);
- // selected text?
- bool const selection = (pos >= row_.sel_beg && pos < row_.sel_end)
- || pi_.selected;
-
// spelling correct?
bool const spell_state =
lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
- char_type prev_char = 0;
// collect as much similar chars as we can
for (++vpos ; vpos < end ; ++vpos) {
pos = bidi_.vis2log(vpos);
- if (pos < font_span.first || pos > font_span.last)
- break;
- bool const new_selection = pos >= row_.sel_beg && pos < row_.sel_end;
- if (new_selection != selection)
- // Selection ends or starts here.
+ if (!font_span.inside(pos))
break;
bool const new_spell_state =
if (c == '\t')
break;
- if (!isPrintableNonspace(c))
- break;
-
- // Work-around bug #6920
- // The bug can be reproduced with DejaVu font under Linux.
- // The issue is that we compute the metrics character by character
- // in ParagraphMetrics::singleWidth(); but we paint word by word
- // for performance reason.
- // Maybe a more general fix would be draw character by character
- // for some predefined fonts on some platform. In arabic and
- // Hebrew we already do paint this way.
- if (prev_char == 'f')
+ // When row_.separator == 0, it is possible to print a
+ // string longer than a word in one fell swoop.
+ // Therefore there is no need to break at spaces.
+ if (!isPrintableNonspace(c)
+ && (c != ' ' || row_.separator > 0))
break;
- /* Because we do our own bidi, at this point the strings are
- * already in visual order. However, Qt also applies its own
- * bidi algorithm to strings that it paints to the screen.
- * Therefore, if we were to paint Hebrew/Arabic words as a
- * single string, the letters in the words would get reversed
- * again. In order to avoid that, we don't collect Hebrew/
- * Arabic characters, but rather paint them one at a time.
- * See also http://thread.gmane.org/gmane.editors.lyx.devel/79740
- */
- if (hebrew)
- break;
-
- /* FIXME: these checks are irrelevant, since 'arabic' and
- * 'hebrew' alone are already going to trigger a break.
- * However, this should not be removed completely, because
- * if an alternative solution is found which allows grouping
- * of arabic and hebrew characters, then these breaks may have
- * to be re-applied.
-
- if (arabic && Encodings::isArabicComposeChar(c))
- break;
-
- if (hebrew && Encodings::isHebrewComposeChar(c))
- break;
- */
-
- if (arabic) {
+ // FIXME: Why only round brackets and why the difference to
+ // Hebrew? See also Paragraph::getUChar
+ if (swap_paren) {
if (c == '(')
c = ')';
else if (c == ')')
c = '(';
- c = par_.transformChar(c, pos);
- /* see comment in hebrew, explaining why we break */
- break;
}
str.push_back(c);
- prev_char = c;
}
- docstring s(&str[0], str.size());
-
- if (s[0] == '\t')
- s.replace(0,1,from_ascii(" "));
+ // Make pos point to the last character in the string.
+ // Using "pos = bidi_.vis2log(vpos)" does not work for some reason.
+ if (vpos < end)
+ pos = bidi_.vis2log(vpos - 1);
+
+ // Now make pos point to the position _after_ the string.
+ // Using vis2log for that is not a good idea in general, we
+ // want logical ordering.
+ if (font.isVisibleRightToLeft())
+ --pos;
+ else
+ ++pos;
+
+ if (str[0] == '\t')
+ str.replace(0,1,from_ascii(" "));
+
+ /* Because we do our own bidi, at this point the strings are
+ * already in visual order. However, Qt also applies its own
+ * bidi algorithm to strings that it paints to the screen.
+ * Therefore, if we were to paint Hebrew/Arabic words as a
+ * single string, the letters in the words would get reversed
+ * again. In order to avoid that, we force LTR drawing.
+ * See also http://thread.gmane.org/gmane.editors.lyx.devel/79740
+ * for an earlier thread on the subject
+ */
+ if (font.isVisibleRightToLeft()) {
+ reverse(str.begin(), str.end());
+ // If the string is reversed, the positions need to be adjusted
+ ++pos;
+ ++start_pos;
+ swap(start_pos, pos);
+ }
+
+ // at least part of text selected?
+ bool const some_sel = (pos >= row_.sel_beg && start_pos < row_.sel_end)
+ || pi_.selected;
+ // all the text selected?
+ bool const all_sel = (start_pos >= row_.sel_beg && pos < row_.sel_end)
+ || pi_.selected;
- if (!selection && !change_running.changed()) {
- x_ += pi_.pain.text(int(x_), yo_, s, font);
- return;
+ if (all_sel) {
+ Font copy = font;
+ copy.fontInfo().setPaintColor(Color_selectiontext);
+ x_ += pi_.pain.text(int(x_), yo_, str, copy);
+ } else if (change_running.changed()) {
+ Font copy = font;
+ copy.fontInfo().setPaintColor(change_running.color());
+ x_ += pi_.pain.text(int(x_), yo_, str, copy);
+ } else if (!some_sel) {
+ x_ += pi_.pain.text(int(x_), yo_, str, font);
+ } else {
+ x_ += pi_.pain.text(int(x_), yo_, str, font, Color_selectiontext,
+ max(row_.sel_beg, start_pos) - start_pos,
+ min(row_.sel_end, pos) - start_pos);
}
+}
- FontInfo copy = font;
- if (change_running.changed())
- copy.setPaintColor(change_running.color());
- else if (selection)
- copy.setPaintColor(Color_selectiontext);
- x_ += pi_.pain.text(int(x_), yo_, s, copy);
+void RowPainter::paintSeparator(double orig_x, double width,
+ FontInfo const & font)
+{
+ pi_.pain.textDecoration(font, int(orig_x), yo_, int(width));
+ x_ += width;
}
if (lang == pi_.base.bv->buffer().params().language)
return;
- int const y = yo_ + 1 + desc;
- pi_.pain.line(int(orig_x), y, int(x_), y, Color_language);
+ int const y = yo_ + solid_line_offset_ + desc + int(solid_line_thickness_/2);
+ pi_.pain.line(int(orig_x), y, int(x_), y, Color_language,
+ Painter::line_solid, solid_line_thickness_);
}
-void RowPainter::paintMisspelledMark(double orig_x, int desc, bool changed)
+void RowPainter::paintMisspelledMark(double orig_x, bool changed)
{
- // derive the offset from zoom factor specified by user in percent
// if changed the misspelled marker gets placed slightly lower than normal
// to avoid drawing at the same vertical offset
- int const offset = int(1.5 * lyxrc.zoom / 100.0); // [percent]
- int const y = yo_ + desc + (changed ? offset : 0);
- pi_.pain.line(int(orig_x), y, int(x_), y, Color_red, Painter::line_onoffdash, 1.0);
+ float const y = yo_ + solid_line_offset_ + solid_line_thickness_
+ + (changed ? solid_line_thickness_ + 1 : 0)
+ + dotted_line_offset_;
+ pi_.pain.line(int(orig_x), int(y), int(x_), int(y), Color_error,
+ Painter::line_onoffdash, dotted_line_thickness_);
}
void RowPainter::paintFromPos(pos_type & vpos, bool changed)
{
pos_type const pos = bidi_.vis2log(vpos);
- Font const orig_font = text_metrics_.displayFont(pit_, pos);
+ Font const font = text_metrics_.displayFont(pit_, pos);
double const orig_x = x_;
- // usual characters, no insets
- char_type const c = par_.getChar(pos);
-
- // special case languages
- string const & lang = orig_font.language()->lang();
- bool const hebrew = lang == "hebrew";
- bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" ||
- lang == "farsi";
-
- // spelling correct?
- bool const misspelled_ =
- lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
-
- // draw as many chars as we can
- if ((!hebrew && !arabic)
- || (hebrew && !Encodings::isHebrewComposeChar(c))
- || (arabic && !Encodings::isArabicComposeChar(c))) {
- paintChars(vpos, orig_font.fontInfo(), hebrew, arabic);
- } else if (hebrew) {
- paintHebrewComposeChar(vpos, orig_font.fontInfo());
- } else if (arabic) {
- paintArabicComposeChar(vpos, orig_font.fontInfo());
- }
-
- paintForeignMark(orig_x, orig_font.language());
-
- if (lyxrc.spellcheck_continuously && misspelled_) {
- paintMisspelledMark(orig_x, 2, changed);
+ paintChars(vpos, font);
+ paintForeignMark(orig_x, font.language());
+
+ // Paint the spelling mark if needed.
+ if (lyxrc.spellcheck_continuously && par_.isMisspelled(pos)) {
+ // check for cursor position
+ // don't draw misspelled marker for words at cursor position
+ // we don't want to disturb the process of text editing
+ BufferView const * bv = pi_.base.bv;
+ DocIterator const nw = bv->cursor().newWord();
+ bool new_word = false;
+ if (!nw.empty() && par_.id() == nw.paragraph().id()) {
+ pos_type cpos = nw.pos();
+ if (cpos > 0 && cpos == par_.size() && !par_.isWordSeparator(cpos-1))
+ --cpos;
+ else if (cpos > 0 && par_.isWordSeparator(cpos))
+ --cpos;
+ new_word = par_.isSameSpellRange(pos, cpos) ;
+ }
+ if (!new_word)
+ paintMisspelledMark(orig_x, changed);
}
}
void RowPainter::paintFirst()
{
- ParagraphParameters const & pparams = par_.params();
- Buffer const & buffer = pi_.base.bv->buffer();
- BufferParams const & bparams = buffer.params();
+ BufferParams const & bparams = pi_.base.bv->buffer().params();
Layout const & layout = par_.layout();
int y_top = 0;
// start of appendix?
- if (pparams.startOfAppendix())
+ if (par_.params().startOfAppendix())
y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
}
}
- bool const is_rtl = text_.isRTL(par_);
- bool const is_seq = text_.isFirstInSequence(pit_);
+ bool const is_first =
+ text_.isFirstInSequence(pit_) || !layout.isParagraphGroup();
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
- // should we print a label?
- if (layout.labeltype >= LABEL_STATIC
- && (layout.labeltype != LABEL_STATIC
- || layout.latextype != LATEX_ENVIRONMENT
- || is_seq)) {
+ if (layout.labelIsInline()
+ && (layout.labeltype != LABEL_STATIC || is_first)) {
+ paintLabel();
+ } else if (is_first && layout.labelIsAbove()) {
+ paintTopLevelLabel();
+ }
+}
- FontInfo const font = labelFont();
- FontMetrics const & fm = theFontMetrics(font);
- docstring const str = par_.labelString();
- if (!str.empty()) {
- double x = x_;
-
- // this is special code for the chapter layout. This is
- // printed in an extra row and has a pagebreak at
- // the top.
- if (layout.counter == "chapter") {
- double spacing_val = 1.0;
- if (!pparams.spacing().isDefault()) {
- spacing_val = pparams.spacing().getValue();
- } else {
- spacing_val = bparams.spacing().getValue();
- }
-
- int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val);
-
- int const maxdesc = int(fm.maxDescent() * layout.spacing.getValue() * spacing_val)
- + int(layout.parsep) * defaultRowHeight();
-
- if (is_rtl) {
- x = width_ - leftMargin() -
- fm.width(str);
- }
-
- pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
- } else {
- if (is_rtl) {
- x = width_ - leftMargin()
- + fm.width(layout.labelsep);
- } else {
- x = x_ - fm.width(layout.labelsep)
- - fm.width(str);
- }
-
- pi_.pain.text(int(x), yo_, str, font);
- }
- }
+void RowPainter::paintLabel()
+{
+ docstring const str = par_.labelString();
+ if (str.empty())
+ return;
- // the labels at the top of an environment.
- // More or less for bibliography
- } else if (is_seq &&
- (layout.labeltype == LABEL_TOP_ENVIRONMENT ||
- layout.labeltype == LABEL_BIBLIO ||
- layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
- FontInfo const font = labelFont();
- docstring const str = par_.labelString();
- if (!str.empty()) {
- double spacing_val = 1.0;
- if (!pparams.spacing().isDefault())
- spacing_val = pparams.spacing().getValue();
- else
- spacing_val = bparams.spacing().getValue();
-
- FontMetrics const & fm = theFontMetrics(font);
-
- int const labeladdon = int(fm.maxHeight()
- * layout.spacing.getValue() * spacing_val);
-
- int maxdesc =
- int(fm.maxDescent() * layout.spacing.getValue() * spacing_val
- + (layout.labelbottomsep * defaultRowHeight()));
-
- double x = x_;
- if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
- if (is_rtl)
- x = leftMargin();
- x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
- x -= fm.width(str) / 2;
- } else if (is_rtl) {
- x = width_ - leftMargin() - fm.width(str);
- }
- pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
- }
+ 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_ - leftMargin()
+ + fm.width(layout.labelsep);
+ } else {
+ x = x_ - fm.width(layout.labelsep)
+ - fm.width(str);
+ }
+
+ pi_.pain.text(int(x), yo_, str, font);
+}
+
+
+void RowPainter::paintTopLevelLabel()
+{
+ 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();
+ docstring const str = par_.labelString();
+ if (str.empty())
+ return;
+
+ double spacing_val = 1.0;
+ if (!pparams.spacing().isDefault())
+ spacing_val = pparams.spacing().getValue();
+ else
+ spacing_val = bparams.spacing().getValue();
+
+ FontMetrics const & fm = theFontMetrics(font);
+
+ int const labeladdon = int(fm.maxHeight()
+ * layout.spacing.getValue() * spacing_val);
+
+ int maxdesc =
+ int(fm.maxDescent() * layout.spacing.getValue() * spacing_val
+ + (layout.labelbottomsep * defaultRowHeight()));
+
+ double x = x_;
+ if (layout.labeltype == LABEL_CENTERED) {
+ if (is_rtl)
+ x = leftMargin();
+ x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
+ x -= fm.width(str) / 2;
+ } else if (is_rtl) {
+ x = width_ - leftMargin() - fm.width(str);
}
+ pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
case END_LABEL_NO_LABEL:
if (lyxrc.paragraph_markers && size_type(pit_ + 1) < pars_.size()) {
docstring const s = docstring(1, char_type(0x00B6));
- FontInfo f = FontInfo();
- FontMetrics const & fm = theFontMetrics(f);
+ FontInfo f = FontInfo(text_.layoutFont(pit_));
f.setColor(Color_paragraphmarker);
pi_.pain.text(int(x_), yo_, s, f);
- x_ += fm.width(s);
+ x_ += theFontMetrics(f).width(s);
}
break;
}
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);
- if (!inset)
+ 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))
font_span.last = inlineCompletionVPos;
}
+ // Note that this value will only be used in
+ // situations where no ligature of composition of
+ // characters is needed. (see comments alginuses of width_pos).
const int width_pos = pm_.singleWidth(pos, font);
- if (x_ + width_pos < 0) {
- x_ += width_pos;
- ++vpos;
- continue;
- }
Change const & change = par_.lookupChange(pos);
if (change.changed() && !change_running.changed()) {
change_running = change;
// Calculate 1/3 height of the buffer's default font
FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont());
- int const y_bar = change_running.deleted() ?
- yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
- pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, 0.5);
+ float const y_bar = change_running.deleted() ?
+ yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
+ pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
+ change_running.color(), Painter::line_solid, solid_line_thickness_);
// Change might continue with a different author or type
if (change.changed() && !highly_editable_inset) {
int const lwidth = theFontMetrics(labelFont())
.width(layout.labelsep);
+ // width_pos is either the width of a space or an inset
x_ += row_.label_hfill + lwidth - width_pos;
}
if (par_.isSeparator(pos)) {
Font const orig_font = text_metrics_.displayFont(pit_, pos);
double const orig_x = x_;
- x_ += width_pos;
+ // width_pos is the width of a space
+ double separator_width = width_pos;
if (pos >= body_pos)
- x_ += row_.separator;
+ separator_width += row_.separator;
+ paintSeparator(orig_x, separator_width, orig_font.fontInfo());
paintForeignMark(orig_x, orig_font.language());
++vpos;
if (change_running.changed()) {
FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont());
- int const y_bar = change_running.deleted() ?
- yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
- pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, 0.5);
+ float const y_bar = change_running.deleted() ?
+ yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
+ pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
+ change_running.color(), Painter::line_solid, solid_line_thickness_);
change_running.setUnchanged();
}
}
+void RowPainter::paintSelection()
+{
+ if (!row_.selection())
+ return;
+ Cursor const & curs = pi_.base.bv->cursor();
+ DocIterator beg = curs.selectionBegin();
+ beg.pit() = pit_;
+ beg.pos() = row_.sel_beg;
+
+ DocIterator end = curs.selectionEnd();
+ end.pit() = 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;
+
+ // 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);
+
+ // 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());
+ }
+
+ 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);
+
+ // 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;
+ }
+ }
+}
+
+
void RowPainter::paintInlineCompletion(Font const & font)
{
docstring completion = pi_.base.bv->inlineCompletion();
swap(c1, c2);
}
- if (s1.size() > 0) {
+ if (!s1.empty()) {
f.setColor(c1);
pi_.pain.text(int(x_), yo_, s1, f);
x_ += theFontMetrics(font).width(s1);
}
- if (s2.size() > 0) {
+ if (!s2.empty()) {
f.setColor(c2);
pi_.pain.text(int(x_), yo_, s2, f);
x_ += theFontMetrics(font).width(s2);
projects / lyx.git / blobdiff