public:
/// initialise and run painter
RowPainter(PainterInfo & pi, LyXText const & text,
- pit_type pit, Row & row, int x, int y);
+ pit_type pit, Row const & row, int x, int y);
// paint various parts
void paintAppendix();
ParagraphList & pars_;
/// The row to paint
- Row & row_;
+ Row const & row_;
/// Row's paragraph
pit_type const pit_;
RowPainter::RowPainter(PainterInfo & pi,
- LyXText const & text, pit_type pit, Row & row, int x, int y)
+ LyXText const & text, pit_type pit, Row const & row, int x, int y)
: bv_(*pi.base.bv), pain_(pi.pain), text_(text), pars_(text.paragraphs()),
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
xo_(x), yo_(y), width_(text_.width())
PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
pi.base.font = getFont(pos);
pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0);
- theCoords.insets_.add(inset, int(x_), yo_);
+ theCoords.insets().add(inset, int(x_), yo_);
inset->drawSelection(pi, int(x_), yo_);
inset->draw(pi, int(x_), yo_);
x_ += inset->width();
// the top.
if (layout->counter == "chapter") {
if (buffer.params().secnumdepth >= 0) {
- float spacing_val = 1.0;
+ double spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
} else {
spacing_val = buffer.params().spacing().getValue();
}
-#warning Look is this correct?
+#ifdef WITH_WARNINGS
+#warning Look is this correct?
+#endif
int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
LyXFont font = getLabelFont();
if (!par_.getLabelstring().empty()) {
string const str = par_.getLabelstring();
- float spacing_val = 1.0;
+ double spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
} else {
// if we reach the end of a struck out range, paint it
// we also don't paint across things like tables
if (running_strikeout && (highly_editable_inset || !is_struckout)) {
- // FIXME this should take real text height into account, not
+ // FIXME this should take real text height into account, not
// the whole row including padding whitespace
//int const middle = yo_ + (- row_.ascent() + row_.top_of_text()) / 2;
int const middle = yo_ - row_.ascent() / 2;
static NullPainter nop;
static PainterInfo nullpi(pi.base.bv, nop);
int const ww = pi.base.bv->workHeight();
-
+
Paragraph & par = text.paragraphs()[pit];
- RowList::iterator const rb = par.rows().begin();
- RowList::iterator const re = par.rows().end();
- theCoords.pars_[&text][pit] = Point(x, y);
+ RowList::const_iterator const rb = par.rows().begin();
+ RowList::const_iterator const re = par.rows().end();
+ theCoords.parPos()[&text][pit] = Point(x, y);
y -= rb->ascent();
- for (RowList::iterator rit = rb; rit != re; ++rit) {
+ for (RowList::const_iterator rit = rb; rit != re; ++rit) {
y += rit->ascent();
bool const inside = (y + rit->descent() >= 0
&& y - rit->ascent() < ww);
RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
-
+
y += rit->descent();
rp.paintAppendix();
rp.paintDepthBar();
paintPar(pi, *bv.text(), pit, 0, yy);
yy += text->getPar(pit).descent();
}
-
+
// paint one paragraph above and one below
if (vi.p1 > 0) {
}
// and grey out above (should not happen later)
- lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl;
+// lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl;
if (vi.y1 > 0)
pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, LColor::bottomarea);
// and possibly grey out below
- lyxerr << "par descent: " << text->getPar(vi.p1).ascent() << endl;
+// lyxerr << "par descent: " << text->getPar(vi.p1).ascent() << endl;
if (vi.y2 < bv.workHeight())
pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea);
}