fix #1073

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

diff --git a/src/mathed/math_xarrowinset.C b/src/mathed/math_xarrowinset.C
index ec26689a5fe1cc06f638db1053996dc7440bf6b2..d5ca0388ea53ac2b626f04dd03a6bed939335bfa 100644 (file)
--- a/src/mathed/math_xarrowinset.C
+++ b/src/mathed/math_xarrowinset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_xarrowinset.h"
 #include "math_support.h"
@@ -12,7 +9,7 @@
 
 
 MathXArrowInset::MathXArrowInset(string const & name)
-       : MathNestInset(1), name_(name)
+       : MathFracbaseInset(), name_(name)
 {}
 
 
@@ -22,31 +19,36 @@ MathInset * MathXArrowInset::clone() const
 }
 
 
-void MathXArrowInset::metrics(MathMetricsInfo & mi) const
+void MathXArrowInset::metrics(MetricsInfo & mi) const
 {
-       //MathMetricsInfo mi = st;
-       //smallerStyleScript(mi);
-       xcell(0).metrics(mi);
-       dim_.w = xcell(0).width() + 10;
-       dim_.a = xcell(0).height() + 10;
-       dim_.d = 0;
+       ScriptChanger dummy(mi.base);
+       cell(0).metrics(mi);
+       cell(1).metrics(mi);
+       dim_.w = std::max(cell(0).width(), cell(1).width()) + 10;
+       dim_.a = cell(0).height() + 10;
+       dim_.d = cell(1).height();
 }
 
 
-void MathXArrowInset::draw(MathPainterInfo & pain, int x, int y) const
+void MathXArrowInset::draw(PainterInfo & pi, 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_);
+       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_);
 }
 
 
 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) << ']';
 }