fix #1073

[lyx.git] / src / mathed / math_frameboxinset.C

diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/math_frameboxinset.C
index 3104f06ae9bdd927c6f4a05bba1c7d6c010e2288..c2f804c2f80405ee72c1b9a76acefd490c206d35 100644 (file)
--- a/src/mathed/math_frameboxinset.C
+++ b/src/mathed/math_frameboxinset.C
@@ -10,7 +10,7 @@
 
 
 MathFrameboxInset::MathFrameboxInset()
-       : MathNestInset(2)
+       : MathNestInset(3)
 {}
 
 
@@ -20,42 +20,55 @@ MathInset * MathFrameboxInset::clone() const
 }
 
 
-void MathFrameboxInset::metrics(MathMetricsInfo & mi) const
+void MathFrameboxInset::metrics(MetricsInfo & mi) const
 {
+       FontSetChanger dummy(mi.base, "textnormal");
        w_ = mathed_char_width(mi.base.font, '[');
        MathNestInset::metrics(mi);
        dim_    = cell(0).dim();
        dim_   += cell(1).dim();
-       dim_.w += 2 * w_ + 4;
+       dim_   += cell(2).dim();
+       dim_.w += 4 * w_ + 4;
        metricsMarkers2(5); // 5 pixels margin
 }
 
 
-void MathFrameboxInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathFrameboxInset::draw(PainterInfo & pi, int x, int y) const
 {
+       FontSetChanger dummy(pi.base, "textnormal");
        pi.pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2,
-                       LColor::black);
+                       LColor::foreground);
        x += 5;
+
        drawStrBlack(pi, x, y, "[");
        x += w_;
        cell(0).draw(pi, x, y);
        x += cell(0).width();
        drawStrBlack(pi, x, y, "]");
        x += w_ + 4;
+
+       drawStrBlack(pi, x, y, "[");
+       x += w_;
        cell(1).draw(pi, x, y);
+       x += cell(1).width();
+       drawStrBlack(pi, x, y, "]");
+       x += w_ + 4;
+
+       cell(2).draw(pi, x, y);
 }
 
 
 void MathFrameboxInset::write(WriteStream & os) const
 {
        os << "\\framebox";
-       if (cell(0).size())
-               os << '[' << cell(0) << ']';
-       os << '{' << cell(1) << '}';
+       os << '[' << cell(0) << ']';
+       if (cell(1).size())
+               os << '[' << cell(1) << ']';
+       os << '{' << cell(2) << '}';
 }
 
 
 void MathFrameboxInset::normalize(NormalStream & os) const
 {
-       os << "[framebox " << cell(0) << ' ' << cell(1) << ']';
+       os << "[framebox " << cell(0) << ' ' << cell(1) << ' ' << cell(2) << ']';
 }