Fix drawing of empty boxes

[lyx.git] / src / mathed / InsetMathBox.cpp

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index 509977b2fbd10ae12a929b6c3795c2e9b2a4b6f2..4c832f0dc5f9c01ba474a2739bad822fb5dc4c62 100644 (file)
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -24,6 +24,7 @@
 
 #include "frontends/Painter.h"
 
+#include <algorithm>
 #include <ostream>
 
 using namespace lyx::support;
@@ -80,22 +81,20 @@ void InsetMathBox::htmlize(HtmlStream & ms) const
 
 void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       FontSetChanger dummy(mi.base, "textnormal");
+       Changer dummy = mi.base.changeFontSet("textnormal");
        cell(0).metrics(mi, dim);
-       metricsMarkers(dim);
 }
 
 
 void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
 {
-       FontSetChanger dummy(pi.base, "textnormal");
+       Changer dummy = pi.base.changeFontSet("textnormal");
        cell(0).draw(pi, x, y);
-       drawMarkers(pi, x, y);
 }
 
 
 void InsetMathBox::infoize(odocstream & os) const
-{      
+{
        os << bformat(_("Box: %1$s"), name_);
 }
 
@@ -132,9 +131,12 @@ InsetMathFBox::InsetMathFBox(Buffer * buf)
 
 void InsetMathFBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       FontSetChanger dummy(mi.base, "textnormal");
+       Changer dummy = mi.base.changeFontSet("textnormal");
        cell(0).metrics(mi, dim);
-       metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
+       // 1 pixel space, 1 frame, 1 space
+       dim.wid += 2 * 3;
+       dim.asc += 3;
+       dim.des += 3;
 }
 
 
@@ -143,9 +145,8 @@ void InsetMathFBox::draw(PainterInfo & pi, int x, int y) const
        Dimension const dim = dimension(*pi.base.bv);
        pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
                dim.width() - 2, dim.height() - 2, Color_foreground);
-       FontSetChanger dummy(pi.base, "textnormal");
+       Changer dummy = pi.base.changeFontSet("textnormal");
        cell(0).draw(pi, x + 3, y);
-       setPosCache(pi, x, y);
 }
 
 
@@ -218,24 +219,24 @@ InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox)
 
 void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       FontSetChanger dummy(mi.base, "textnormal");
-       
+       Changer dummy = mi.base.changeFontSet("textnormal");
+
        Dimension wdim;
        static docstring bracket = from_ascii("[");
        metricsStrRedBlack(mi, wdim, bracket);
        int w = wdim.wid;
-       
+
        Dimension dim0;
        Dimension dim1;
        Dimension dim2;
        cell(0).metrics(mi, dim0);
        cell(1).metrics(mi, dim1);
        cell(2).metrics(mi, dim2);
-       
+
        dim.wid = w + dim0.wid + w + w + dim1.wid + w + 2 + dim2.wid;
-       dim.asc = std::max(std::max(wdim.asc, dim0.asc), std::max(dim1.asc, dim2.asc)); 
+       dim.asc = std::max(std::max(wdim.asc, dim0.asc), std::max(dim1.asc, dim2.asc));
        dim.des = std::max(std::max(wdim.des, dim0.des), std::max(dim1.des, dim2.des));
-       
+
        if (framebox_) {
                dim.wid += 4;
                dim.asc += 3;
@@ -244,26 +245,22 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.asc += 1;
                dim.des += 1;
        }
-       
-       metricsMarkers(dim);
 }
 
 
 void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
 {
-       drawMarkers(pi, x, y);
-       
-       FontSetChanger dummy(pi.base, "textnormal");
+       Changer dummy = pi.base.changeFontSet("textnormal");
        BufferView const & bv = *pi.base.bv;
        int w = mathed_char_width(pi.base.font, '[');
-       
+
        if (framebox_) {
                Dimension const dim = dimension(*pi.base.bv);
                pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
                                  dim.width() - 2, dim.height() - 2, Color_foreground);
                x += 2;
        }
-       
+
        drawStrBlack(pi, x, y, from_ascii("["));
        x += w;
        cell(0).draw(pi, x, y);
@@ -359,7 +356,10 @@ InsetMathBoxed::InsetMathBoxed(Buffer * buf)
 void InsetMathBoxed::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
-       metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
+       // 1 pixel space, 1 frame, 1 space
+       dim.wid += 2 * 3;
+       dim.asc += 3;
+       dim.des += 3;
 }
 
 
@@ -369,7 +369,6 @@ void InsetMathBoxed::draw(PainterInfo & pi, int x, int y) const
        pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
                dim.width() - 2, dim.height() - 2, Color_foreground);
        cell(0).draw(pi, x + 3, y);
-       setPosCache(pi, x, y);
 }