anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-23 08:44:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* insets/inset.h:

Browse Source 
* rowpainter.C: visualize deleted/inserted end-of-par characters (change tracking)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16017 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-11-23 18:59:05 +00:00
parent 34e92f1540
commit 0777d41fef
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/insets/inset.h
View File

@ -30,7 +30,7 @@ public:
/// ///
enum { enum {
/// ///
TEXT_TO_INSET_OFFSET = 2 TEXT_TO_INSET_OFFSET = 4
}; };
/// ///

18
src/rowpainter.C
View File

@ -637,7 +637,21 @@ void RowPainter::paintLast()
bool const is_rtl = text_.isRTL(*bv_.buffer(), par_); bool const is_rtl = text_.isRTL(*bv_.buffer(), par_);
int const endlabel = getEndLabel(pit_, text_.paragraphs()); 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(x_ + 1, yo_ + 2, x_ + 1, yo_ + 2 - length, col,
Painter::line_solid, Painter::line_thick);
pain_.line(x_ + 1 - length, yo_ + 2, x_ + 1, yo_ + 2, col,
Painter::line_solid, Painter::line_thick);
}
// draw an endlabel // draw an endlabel
switch (endlabel) { switch (endlabel) {
case END_LABEL_BOX: case END_LABEL_BOX:
case END_LABEL_FILLED_BOX: { case END_LABEL_FILLED_BOX: {
@ -936,9 +950,9 @@ void paintPar
rp.paintChangeBar(); rp.paintChangeBar();
if (rit == rb) if (rit == rb)
rp.paintFirst(); rp.paintFirst();
rp.paintText();
if (rit + 1 == re) if (rit + 1 == re)
rp.paintLast(); rp.paintLast();
rp.paintText();
} }
y += rit->descent(); y += rit->descent();
// Restore, see above // Restore, see above
@ -1020,7 +1034,7 @@ void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
// lyxerr << " paintTextInset: y: " << y << endl; // lyxerr << " paintTextInset: y: " << y << endl;
y -= text.getPar(0).ascent(); 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; bool repaintAll = refreshInside;
for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) { for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
y += text.getPar(pit).ascent(); y += text.getPar(pit).ascent();