Remove hardcoded values

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

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index 9e3c91d003d2a89d86625e0d911bc380e1573246..d2121d6dfef331cc1ed577e12ffedbab6b16201f 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -13,12 +13,17 @@
 #include "support/lassert.h"
 
 #include "InsetMathXArrow.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
+
+#include <algorithm>
 
 using namespace std;
 
@@ -38,7 +43,8 @@ Inset * InsetMathXArrow::clone() const
 
 void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       ScriptChanger dummy(mi.base);
+       Changer dummy2 = mi.base.changeEnsureMath();
+       Changer dummy = mi.base.changeScript();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
        Dimension dim1;
@@ -46,13 +52,14 @@ void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.wid = max(dim0.width(), dim1.width()) + 10;
        dim.asc = dim0.height() + 10;
        dim.des = dim1.height();
-       metricsMarkers(dim);
+       metricsMarkers(mi, dim);
 }
 
 
 void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 {
-       ScriptChanger dummy(pi.base);
+       Changer dummy2 = pi.base.changeEnsureMath();
+       Changer dummy = pi.base.changeScript();
        Dimension const dim = dimension(*pi.base.bv);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        // center the cells with the decoration