Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_xarrowinset.C b/src/mathed/math_xarrowinset.C
index 217d95a2f71324c3dbecc80c8e3894e99204c1a2..3676171d5438914e4e26993668b5863ba3cde1ac 100644 (file)
--- a/src/mathed/math_xarrowinset.C
+++ b/src/mathed/math_xarrowinset.C
@@ -1,52 +1,69 @@
-#include <config.h>
+/**
+ * \file math_xarrowinset.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_xarrowinset.h"
-#include "math_support.h"
-#include "math_parser.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "math_support.h"
+
+using std::string;
+using std::auto_ptr;
 
 
 MathXArrowInset::MathXArrowInset(string const & name)
-       : MathNestInset(1), name_(name)
+       : MathFracbaseInset(), name_(name)
 {}
 
 
-MathInset * MathXArrowInset::clone() const
-{   
-       return new MathXArrowInset(*this);
+auto_ptr<InsetBase> MathXArrowInset::doClone() const
+{
+       return auto_ptr<InsetBase>(new MathXArrowInset(*this));
 }
 
 
-void MathXArrowInset::metrics(MathMetricsInfo const & st) const
+void MathXArrowInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathMetricsInfo mi = st;
-       smallerStyleScript(mi);
-       xcell(0).metrics(mi);
-       width_   = xcell(0).width() + 10;
-       ascent_  = xcell(0).height() + 10;
-       descent_ = 0;
+       ScriptChanger dummy(mi.base);
+       cell(0).metrics(mi);
+       cell(1).metrics(mi);
+       dim.wid = std::max(cell(0).width(), cell(1).width()) + 10;
+       dim.asc = cell(0).height() + 10;
+       dim.des = cell(1).height();
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathXArrowInset::draw(Painter & pain, int x, int y) const
-{ 
-       xcell(0).draw(pain, x + 5, y - 10);
-       mathed_draw_deco(pain, x + 1, y - 7, width_ - 2, 5, name_);
+void MathXArrowInset::draw(PainterInfo & pi, int x, int y) const
+{
+       ScriptChanger dummy(pi.base);
+       cell(0).draw(pi, x + 5, y - 10);
+       cell(1).draw(pi, x + 5, y + cell(1).height());
+       mathed_draw_deco(pi, x + 1, y - 7, width() - 2, 5, name_);
+       drawMarkers(pi, x, y);
 }
 
 
 void MathXArrowInset::write(WriteStream & os) const
 {
-       os << '\\' << name_ << '{' << cell(0) << '}';
+       os << '\\' << name_;
+       if (cell(1).size())
+               os << '[' << cell(1) << ']';
+       os << '{' << cell(0) << '}';
 }
 
 
 void MathXArrowInset::normalize(NormalStream & os) const
 {
-       os << "[xarrow " << name_ << ' ' <<  cell(0) << ']';
+       os << "[xarrow " << name_ << ' ' <<  cell(0) << ' ' << cell(1) << ']';
 }