anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Draw frame last when drawing text insets

Browse Source 
This avoid cases where the blinking cursor erases the frame.
This commit is contained in:
Jean-Marc Lasgouttes 2018-05-25 17:08:45 +02:00
parent 38f04cb162
commit 4e9084b3e4
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/insets/InsetText.cpp
View File

@ -220,11 +220,25 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET; int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
int const xframe = x + TEXT_TO_INSET_OFFSET / 2; int const xframe = x + TEXT_TO_INSET_OFFSET / 2;
bool change_drawn = false; bool change_drawn = false;
if (drawFrame_ || pi.full_repaint) { if (pi.full_repaint)
if (pi.full_repaint)
pi.pain.fillRectangle(xframe, yframe, w, h, pi.pain.fillRectangle(xframe, yframe, w, h,
pi.backgroundColor(this)); pi.backgroundColor(this));
{
Changer dummy = make_change(pi.background_color,
pi.backgroundColor(this, false));
// The change tracking cue must not be inherited
Changer dummy2 = make_change(pi.change_, Change());
tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
}
if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change_.deleted()))
// Do not draw the change tracking cue if already done by RowPainter and
// do not draw the cue for INSERTED if the information is already in the
// color of the frame
pi.change_.paintCue(pi, xframe, yframe, xframe + w, yframe + h);
if (drawFrame_) {
// Change color of the frame in tracked changes, like for tabulars. // Change color of the frame in tracked changes, like for tabulars.
// Only do so if the color is not custom. But do so even if RowPainter // Only do so if the color is not custom. But do so even if RowPainter
// handles the strike-through already. // handles the strike-through already.
@ -242,21 +256,8 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
change_drawn = true; change_drawn = true;
} else } else
c = frameColor(); c = frameColor();
if (drawFrame_) pi.pain.rectangle(xframe, yframe, w, h, c);
pi.pain.rectangle(xframe, yframe, w, h, c);
} }
{
Changer dummy = make_change(pi.background_color,
pi.backgroundColor(this, false));
// The change tracking cue must not be inherited
Changer dummy2 = make_change(pi.change_, Change());
tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
}
if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change_.deleted()))
// Do not draw the change tracking cue if already done by RowPainter and
// do not draw the cue for INSERTED if the information is already in the
// color of the frame
pi.change_.paintCue(pi, xframe, yframe, xframe + w, yframe + h);
} }