using std::endl;
using std::max;
-using std::min;
using std::string;
bool const is_rtl = text_.isRTL(*bv_.buffer(), par_);
int const endlabel = getEndLabel(pit_, text_.paragraphs());
+ // paint imaginary end-of-paragraph character
+
+ if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
+ FontMetrics const & fm = theFontMetrics(bv_.buffer()->params().getFont());
+ int const length = fm.maxAscent() / 2;
+ LColor::color col = par_.isInserted(par_.size()) ? LColor::newtext : LColor::strikeout;
+
+ pain_.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
+ Painter::line_solid, Painter::line_thick);
+ pain_.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
+ Painter::line_solid, Painter::line_thick);
+ }
+
// draw an endlabel
+
switch (endlabel) {
case END_LABEL_BOX:
case END_LABEL_FILLED_BOX: {
bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
bool in_inset_alone_on_row = innerCursorOnRow(pi, pit, rit,
text);
+ bool leftEdgeFixed =
+ (par.getAlign() == LYX_ALIGN_LEFT ||
+ par.getAlign() == LYX_ALIGN_BLOCK);
// If this is the only object on the row, we can make it wide
//
if (in) {
InsetText * t = const_cast<InsetText *>(in->asTextInset());
if (t)
- t->setWide(in_inset_alone_on_row);
+ t->setWide(in_inset_alone_on_row && leftEdgeFixed);
}
}
// Clear background of this row
// (if paragraph background was not cleared)
if (!repaintAll &&
- (!in_inset_alone_on_row || row_has_changed)) {
+ (!(in_inset_alone_on_row && leftEdgeFixed)
+ || row_has_changed)) {
pi.pain.fillRectangle(x, y - rit->ascent(),
text.maxwidth_, rit->height(),
text.backgroundColor());
rp.paintChangeBar();
if (rit == rb)
rp.paintFirst();
+ rp.paintText();
if (rit + 1 == re)
rp.paintLast();
- rp.paintText();
}
y += rit->descent();
// Restore, see above
yy += par.descent();
}
- // Cache one paragraph above and one below
- // Note MV: this cannot be suppressed even for singlepar.
- // Try viewing the User Guide Mobius figure
-
- if (vi.p1 > 0) {
- text.redoParagraph(bv, vi.p1 - 1);
- bv.coordCache().parPos()[&text][vi.p1 - 1] =
- Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent());
- }
-
- if (vi.p2 < pit_type(text.paragraphs().size()) - 1) {
- text.redoParagraph(bv, vi.p2 + 1);
- bv.coordCache().parPos()[&text][vi.p2 + 1] =
- Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent());
- }
-
// and grey out above (should not happen later)
// lyxerr << "par ascent: " << text.getPar(vi.p1).ascent() << endl;
if (vi.y1 > 0 && !vi.singlepar)
// lyxerr << " paintTextInset: y: " << y << endl;
y -= text.getPar(0).ascent();
- // This flag can not be set from within same inset:
+ // This flag cannot be set from within same inset:
bool repaintAll = refreshInside;
for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
y += text.getPar(pit).ascent();