class RowPainter {
public:
/// initialise and run painter
- RowPainter(PainterInfo & pi, LyXText const & text,
+ RowPainter(PainterInfo & pi, Text const & text,
pit_type pit, Row const & row, int x, int y);
// paint various parts
int maxWidth() { return max_width_; }
private:
- void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
- void paintHebrewComposeChar(pos_type & vpos, LyXFont const & font);
- void paintArabicComposeChar(pos_type & vpos, LyXFont const & font);
- void paintChars(pos_type & vpos, LyXFont const & font,
+ void paintForeignMark(double orig_x, Font const & font, int desc = 0);
+ void paintHebrewComposeChar(pos_type & vpos, Font const & font);
+ void paintArabicComposeChar(pos_type & vpos, Font const & font);
+ void paintChars(pos_type & vpos, Font const & font,
bool hebrew, bool arabic);
int paintAppendixStart(int y);
void paintFromPos(pos_type & vpos);
- void paintInset(pos_type const pos, LyXFont const & font);
+ void paintInset(pos_type const pos, Font const & font);
/// return left margin
int leftMargin() const;
/// return the label font for this row
- LyXFont const getLabelFont() const;
+ Font const getLabelFont() const;
/// bufferview to paint on
BufferView & bv_;
/// Painter to use
Painter & pain_;
- /// LyXText for the row
- LyXText const & text_;
+ /// Text for the row
+ Text const & text_;
TextMetrics & text_metrics_;
ParagraphList const & pars_;
RowPainter::RowPainter(PainterInfo & pi,
- LyXText const & text, pit_type pit, Row const & row, int x, int y)
+ Text const & text, pit_type pit, Row const & row, int x, int y)
: bv_(*pi.base.bv), pain_(pi.pain), text_(text),
text_metrics_(pi.base.bv->textMetrics(&text)),
pars_(text.paragraphs()),
}
-LyXFont const RowPainter::getLabelFont() const
+Font const RowPainter::getLabelFont() const
{
return text_.getLabelFont(*bv_.buffer(), par_);
}
// This draws green lines around each inset.
-void RowPainter::paintInset(pos_type const pos, LyXFont const & font)
+void RowPainter::paintInset(pos_type const pos, Font const & font)
{
- InsetBase const * inset = par_.getInset(pos);
+ Inset const * inset = par_.getInset(pos);
BOOST_ASSERT(inset);
PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
// FIXME: We should always use font, see documentation of
- // noFontChange() in InsetBase.h.
+ // noFontChange() in Inset.h.
pi.base.font = inset->noFontChange() ?
bv_.buffer()->params().getFont() :
font;
}
-void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
+void RowPainter::paintHebrewComposeChar(pos_type & vpos, Font const & font)
{
pos_type pos = text_.bidi.vis2log(vpos);
}
-void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
+void RowPainter::paintArabicComposeChar(pos_type & vpos, Font const & font)
{
pos_type pos = text_.bidi.vis2log(vpos);
docstring str;
}
-void RowPainter::paintChars(pos_type & vpos, LyXFont const & font,
+void RowPainter::paintChars(pos_type & vpos, Font const & font,
bool hebrew, bool arabic)
{
// This method takes up 70% of time when typing
docstring s(&str[0], str.size());
if (prev_change != Change::UNCHANGED) {
- LyXFont copy(font);
+ Font copy(font);
if (prev_change == Change::DELETED) {
- copy.setColor(Color::strikeout);
+ copy.setColor(Color::deletedtext);
} else if (prev_change == Change::INSERTED) {
- copy.setColor(Color::newtext);
+ copy.setColor(Color::addedtext);
}
x_ += pain_.text(int(x_), yo_, s, copy);
} else {
}
-void RowPainter::paintForeignMark(double orig_x, LyXFont const & font, int desc)
+void RowPainter::paintForeignMark(double orig_x, Font const & font, int desc)
{
if (!lyxrc.mark_foreign_language)
return;
void RowPainter::paintFromPos(pos_type & vpos)
{
pos_type const pos = text_.bidi.vis2log(vpos);
- LyXFont orig_font = text_.getFont(*bv_.buffer(), par_, pos);
+ Font orig_font = text_.getFont(*bv_.buffer(), par_, pos);
double const orig_x = x_;
int RowPainter::paintAppendixStart(int y)
{
- LyXFont pb_font;
+ Font pb_font;
pb_font.setColor(Color::appendix);
pb_font.decSize();
Buffer const & buffer = *bv_.buffer();
- LyXLayout_ptr const & layout = par_.layout();
+ Layout_ptr const & layout = par_.layout();
if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
if (pit_ != 0) {
&& !par_.getDepth()) {
y_top += buffer.params().getDefSkip().inPixels(bv_);
} else {
- LyXLayout_ptr const & playout = pars_[pit_ - 1].layout();
+ Layout_ptr const & playout = pars_[pit_ - 1].layout();
if (playout->latextype == LATEX_PARAGRAPH
&& !pars_[pit_ - 1].getDepth()) {
// is it right to use defskip here, too? (AS)
|| layout->latextype != LATEX_ENVIRONMENT
|| is_seq)) {
- LyXFont const font = getLabelFont();
+ Font const font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const str = par_.getLabelstring();
(layout->labeltype == LABEL_TOP_ENVIRONMENT ||
layout->labeltype == LABEL_BIBLIO ||
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
- LyXFont font = getLabelFont();
+ Font font = getLabelFont();
if (!par_.getLabelstring().empty()) {
docstring const str = par_.getLabelstring();
double spacing_val = 1.0;
if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
FontMetrics const & fm = theFontMetrics(bv_.buffer()->params().getFont());
int const length = fm.maxAscent() / 2;
- Color::color col = par_.isInserted(par_.size()) ? Color::newtext : Color::strikeout;
+ Color::color col = par_.isInserted(par_.size()) ? Color::addedtext : Color::deletedtext;
pain_.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
Painter::line_solid, Painter::line_thick);
switch (endlabel) {
case END_LABEL_BOX:
case END_LABEL_FILLED_BOX: {
- LyXFont const font = getLabelFont();
+ Font const font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
}
case END_LABEL_STATIC: {
- LyXFont font = getLabelFont();
+ Font font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout()->endlabelstring();
double const x = is_rtl ?
body_pos = 0;
}
- LyXLayout_ptr const & layout = par_.layout();
+ Layout_ptr const & layout = par_.layout();
bool running_strikeout = false;
bool is_struckout = false;
// Use font span to speed things up, see below
FontSpan font_span;
- LyXFont font;
+ Font font;
Buffer const & buffer = *bv_.buffer();
for (pos_type vpos = row_.pos(); vpos < end; ) {
= theFontMetrics(bv_.buffer()->params().getFont());
int const middle = yo_ - fm.maxAscent() / 3;
pain_.line(last_strikeout_x, middle, int(x_), middle,
- Color::strikeout, Painter::line_solid, Painter::line_thin);
+ Color::deletedtext, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
x_ += 2;
++vpos;
} else if (par_.isSeparator(pos)) {
+ Font orig_font = text_.getFont(*bv_.buffer(), par_, pos);
+ double const orig_x = x_;
x_ += width_pos;
if (pos >= body_pos)
x_ += separator_;
++vpos;
+ paintForeignMark(orig_x, orig_font);
} else {
paintFromPos(vpos);
}
= theFontMetrics(bv_.buffer()->params().getFont());
int const middle = yo_ - fm.maxAscent() / 3;
pain_.line(last_strikeout_x, middle, int(x_), middle,
- Color::strikeout, Painter::line_solid, Painter::line_thin);
+ Color::deletedtext, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
}
bool CursorOnRow(PainterInfo & pi, pit_type const pit,
- RowList::const_iterator rit, LyXText const & text)
+ RowList::const_iterator rit, Text const & text)
{
// Is there a cursor on this row (or inside inset on row)
Cursor & cur = pi.base.bv->cursor();
bool innerCursorOnRow(PainterInfo & pi, pit_type pit,
- RowList::const_iterator rit, LyXText const & text)
+ RowList::const_iterator rit, Text const & text)
{
// Is there a cursor inside an inset on this row, and is this inset
// the only "character" on this row
// check whether the current inset is nested in a non-wide inset
Cursor & cur = pi.base.bv->cursor();
for (int i = cur.depth() - 1; --i >= 0; ) {
- InsetBase * const in = &cur[i].inset();
+ Inset * const in = &cur[i].inset();
if (in) {
InsetText * t =
const_cast<InsetText *>(in->asTextInset());
void paintPar
- (PainterInfo & pi, LyXText const & text, pit_type pit, int x, int y,
+ (PainterInfo & pi, Text const & text, pit_type pit, int x, int y,
bool repaintAll)
{
// lyxerr << " paintPar: pit: " << pit << " at y: " << y << endl;
// JSpitzm: We should aim at removing wide() altogether while retaining
// typing speed within insets.
for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
- InsetBase const * const in = par.getInset(i);
+ Inset const * const in = par.getInset(i);
if (in) {
InsetText * t = const_cast<InsetText *>(in->asTextInset());
if (t)
{
BOOST_ASSERT(bv.buffer());
Buffer const & buffer = *bv.buffer();
- LyXText & text = buffer.text();
+ Text & text = buffer.text();
bool const select = bv.cursor().selection();
ViewMetricsInfo const & vi = bv.viewMetricsInfo();
}
-void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
+void paintTextInset(Text const & text, PainterInfo & pi, int x, int y)
{
// lyxerr << " paintTextInset: y: " << y << endl;