anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve drawing of macro template frame

Browse Source 
Use Inset::xxxOffset as offsets and draw the frame in the middle of
the empty space.

Fixes bug #9657.
This commit is contained in:
Jean-Marc Lasgouttes 2020-07-12 15:37:58 +02:00
parent 5df5cc3840
commit 1c956cdc16
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mathed/InsetMathMacroTemplate.cpp
View File

@ -574,9 +574,9 @@ void InsetMathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
if (macro) if (macro)
macro->unlock(); macro->unlock();
dim.wid += 6; dim.wid += leftOffset(mi.base.bv) + rightOffset(mi.base.bv);;
dim.des += 2; dim.des += bottomOffset(mi.base.bv);
dim.asc += 2; dim.asc += topOffset(mi.base.bv);
} }
@ -590,17 +590,19 @@ void InsetMathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
Dimension const dim = dimension(*pi.base.bv); Dimension const dim = dimension(*pi.base.bv);
// draw outer frame // draw outer frame
int const a = y - dim.asc + 1; int const hoffset = leftOffset(pi.base.bv) + rightOffset(pi.base.bv);
int const w = dim.wid - 2; int const voffset = topOffset(pi.base.bv) + bottomOffset(pi.base.bv);
int const h = dim.height() - 2; int const a = y - dim.asc + topOffset(pi.base.bv) / 2;
pi.pain.rectangle(x + 1, a, w, h, Color_mathframe); int const w = dim.wid - (hoffset - hoffset / 2);
int const h = dim.height() - (voffset - voffset / 2);
pi.pain.rectangle(x + leftOffset(pi.base.bv) / 2, a, w, h, Color_mathframe);
// just to be sure: set some dummy values for coord cache // just to be sure: set some dummy values for coord cache
for (idx_type i = 0; i < nargs(); ++i) for (idx_type i = 0; i < nargs(); ++i)
cell(i).setXY(*pi.base.bv, x, y); cell(i).setXY(*pi.base.bv, x, y);
// draw contents // draw contents
look_.draw(pi, x + 3, y); look_.draw(pi, x + leftOffset(pi.base.bv), y);
} }