From 1538a8352ca82914bc131f2bf98b0ef4f55c1e2d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 8 Jun 2017 16:46:19 +0200 Subject: [PATCH] Revert "Give a 2 pixels space for markers around math objects" This is not ready yet. This reverts commit 5a3962958f2a2c5370b302d6dfea0967343b9a46. --- src/mathed/MathRow.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp index b312e22e6f..783e85ab54 100644 --- a/src/mathed/MathRow.cpp +++ b/src/mathed/MathRow.cpp @@ -49,16 +49,8 @@ namespace { int markerMargin(MathRow::Element const & e) { - 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; + return e.marker == InsetMath::MARKER + || e.marker == InsetMath::MARKER2; } @@ -100,7 +92,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) > 0 ? 1 : 0); + int const l = x + e.before - markerMargin(e); int const r = x + dim.width() - e.after; if (e.marker == InsetMath::BOX_MARKER) { -- 2.39.2