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

Give a 2 pixels space for markers around math objects

Browse Source 
This is necessary when markers are nested. Ideally this should only be
done when there is risk of nesting.

Fixes (part of?) bug #10688.
This commit is contained in:
Jean-Marc Lasgouttes 2017-06-08 15:22:03 +02:00
parent e1e85b547b
commit 183c97d8a8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mathed/MathRow.cpp
View File

@ -49,8 +49,16 @@ namespace {
int markerMargin(MathRow::Element const & e)
{
return e.marker == InsetMath::MARKER
|| e.marker == InsetMath::MARKER2;
switch(e.marker) {
case InsetMath::MARKER:
case InsetMath::MARKER2:
case InsetMath::BOX_MARKER:
return 2;
case InsetMath::NO_MARKER:
return 0;
}
// should not happen
return 0;
}
@ -92,7 +100,7 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
Dimension const dim = coords.getInsets().dim(e.inset);
// the marker is before/after the inset. Necessary space has been reserved already.
int const l = x + e.before - markerMargin(e);
int const l = x + e.before - (markerMargin(e) > 0 ? 1 : 0);
int const r = x + dim.width() - e.after;
if (e.marker == InsetMath::BOX_MARKER) {