Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

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

diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index 7b4fbef5ef80fa6b2a80d21b19df2e1a275ed572..d67d9fed8f421ed3dba31b553020b1706641a6bf 100644 (file)
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,6 +14,7 @@
 #include "MathData.h"
 #include "MathStream.h"
 
+using namespace std;
 
 namespace lyx {
 
@@ -29,30 +30,35 @@ Inset * InsetMathStackrel::clone() const
 
 void InsetMathStackrel::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(1).metrics(mi);
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
        FracChanger dummy(mi.base);
-       cell(0).metrics(mi);
-       dim.wid = std::max(cell(0).width(), cell(1).width()) + 4;
-       dim.asc = cell(1).ascent() + cell(0).height() + 4;
-       dim.des = cell(1).descent();
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
+       dim.wid = max(dim0.width(), dim1.width()) + 4;
+       dim.asc = dim1.ascent() + dim0.height() + 4;
+       dim.des = dim1.descent();
        metricsMarkers(dim);
-       dim_ = dim;
 }
 
 
 void InsetMathStackrel::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + dim_.width() / 2;
-       int yo = y - cell(1).ascent() - cell(0).descent() - 1;
-       cell(1).draw(pi, m - cell(1).width() / 2, y);
+       Dimension const dim = dimension(*pi.base.bv);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
+       Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+       int m  = x + dim.width() / 2;
+       int yo = y - dim1.ascent() - dim0.descent() - 1;
+       cell(1).draw(pi, m - dim1.width() / 2, y);
        FracChanger dummy(pi.base);
-       cell(0).draw(pi, m - cell(0).width() / 2, yo);
+       cell(0).draw(pi, m - dim0.width() / 2, yo);
        drawMarkers(pi, x, y);
 }
 
 
 void InsetMathStackrel::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
        os << "\\stackrel{" << cell(0) << "}{" << cell(1) << '}';
 }