Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/math_frameboxinset.C
index d7ab17872f977a59f515c400b0fb5847ed7f8c19..bb6badd6bb7590b1404052c1f5fa8de8f591ccd3 100644 (file)
--- a/src/mathed/math_frameboxinset.C
+++ b/src/mathed/math_frameboxinset.C
@@ -1,64 +1,86 @@
-#include <config.h>
+/**
+ * \file math_frameboxinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_frameboxinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "math_support.h"
+#include "LColor.h"
 #include "frontends/Painter.h"
 
+using std::auto_ptr;
 
 
 MathFrameboxInset::MathFrameboxInset()
-       : MathNestInset(2)
+       : MathNestInset(3)
 {}
 
 
-MathInset * MathFrameboxInset::clone() const
+auto_ptr<InsetBase> MathFrameboxInset::doClone() const
 {
-       return new MathFrameboxInset(*this);
+       return auto_ptr<InsetBase>(new MathFrameboxInset(*this));
 }
 
 
-void MathFrameboxInset::metrics(MathMetricsInfo & mi) const
+void MathFrameboxInset::metrics(MetricsInfo & mi, Dimension & dim) 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;
-       metricsMarkers2(5); // 5 pixels margin
+       dim  = cell(0).dim();
+       dim += cell(1).dim();
+       dim += cell(2).dim();
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathFrameboxInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathFrameboxInset::draw(PainterInfo & pi, int x, int y) const
 {
-       pi.pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2,
-                       LColor::black);
+       FontSetChanger dummy(pi.base, "textnormal");
+       pi.pain.rectangle(x + 1, y - dim_.ascent() + 1,
+               dim_.width() - 2, dim_.height() - 2, 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);
+       drawMarkers(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) << ']';
 }