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

Fixup ee0bd36a86: only clear margins when needed

Browse Source 
The old code would erase text around inline math.

Related to #11333.
This commit is contained in:
Jean-Marc Lasgouttes 2019-07-15 13:02:05 +02:00
parent b1bdc75a10
commit 009e7a61bb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mathed/InsetMathHull.cpp
View File

@ -632,6 +632,11 @@ void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const
dim.wid, dim.asc + dim.des, backgroundColor(pi)); dim.wid, dim.asc + dim.des, backgroundColor(pi));
return; return;
} }
// If there are numbers, the margins around the (displayed)
// equation have to be cleared.
if (numberedType())
pi.pain.fillRectangle(pi.leftx, y - dim.asc,
pi.rightx - pi.leftx, dim.height(), pi.background_color);
pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2, pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2,
dim.asc + dim.des - 1, pi.backgroundColor(this)); dim.asc + dim.des - 1, pi.backgroundColor(this));
} }
@ -664,18 +669,12 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
} }
// First draw the numbers // First draw the numbers
if (!pi.full_repaint)
pi.pain.fillRectangle(pi.leftx, y - dim.asc,
pi.rightx - pi.leftx, dim.height(),
pi.background_color);
ColorCode color = pi.selected && lyxrc.use_system_colors ColorCode color = pi.selected && lyxrc.use_system_colors
? Color_selectiontext : standardColor(); ? Color_selectiontext : standardColor();
bool const really_change_color = pi.base.font.color() == Color_none; bool const really_change_color = pi.base.font.color() == Color_none;
Changer dummy0 = really_change_color ? pi.base.font.changeColor(color) Changer dummy0 = really_change_color ? pi.base.font.changeColor(color)
: Changer(); : Changer();
if (numberedType()) { if (numberedType()) {
LATTEST(pi.leftx <pi.rightx);
BufferParams::MathNumber const math_number = buffer().params().getMathNumber(); BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
for (row_type row = 0; row < nrows(); ++row) { for (row_type row = 0; row < nrows(); ++row) {
int yy = y + rowinfo(row).offset[bv]; int yy = y + rowinfo(row).offset[bv];