Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index aef7818e5ddc7bf86e86f12a3859e52e72064602..1ac234823036257e0ec9e6947d6f5b0553eb74e6 100644 (file)
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -18,10 +18,12 @@
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
+#include "MetricsInfo.h"
 #include "TextPainter.h"
 
 #include "frontends/Painter.h"
 
+using namespace std;
 
 namespace lyx {
 
@@ -43,7 +45,7 @@ bool InsetMathFracBase::idxUpDown(Cursor & cur, bool up) const
        if (cur.idx() == target)
                return false;
        cur.idx() = target;
-       cur.pos() = cell(target).x2pos(cur.x_target());
+       cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
        return true;
 }
 
@@ -92,7 +94,7 @@ bool InsetMathFrac::idxForward(Cursor & cur) const
        if (cur.idx() == target)
                return false;
        cur.idx() = target;
-       cur.pos() = cell(target).x2pos(cur.x_target());
+       cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
        return true;
 }
 
@@ -110,7 +112,7 @@ bool InsetMathFrac::idxBackward(Cursor & cur) const
        if (cur.idx() == target)
                return false;
        cur.idx() = target;
-       cur.pos() = cell(target).x2pos(cur.x_target());
+       cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
        return true;
 }
 
@@ -131,8 +133,8 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
                        ShapeChanger dummy2(mi.base.font, UP_SHAPE);
                        cell(1).metrics(mi, dim1);
                        dim.wid = dim0.width() + dim1.wid + 5;
-                       dim.asc = std::max(dim0.asc, dim1.asc);
-                       dim.des = std::max(dim0.des, dim1.des);
+                       dim.asc = max(dim0.asc, dim1.asc);
+                       dim.des = max(dim0.des, dim1.des);
                } else {
                        cell(2).metrics(mi, dim2);
                        ShapeChanger dummy2(mi.base.font, UP_SHAPE);
@@ -140,8 +142,8 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
                        cell(0).metrics(mi, dim0);
                        cell(1).metrics(mi, dim1);
                        dim.wid = dim0.width() + dim1.wid + dim2.wid + 10;
-                       dim.asc = std::max(dim2.asc, dim0.height() + 5);
-                       dim.des = std::max(dim2.des, dim1.height() - 5);
+                       dim.asc = max(dim2.asc, dim0.height() + 5);
+                       dim.des = max(dim2.des, dim1.height() - 5);
                }
        } else {
                FracChanger dummy(mi.base);
@@ -160,14 +162,12 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
                        dim.asc = dim0.height() + 5;
                        dim.des = dim1.height() - 5;
                } else {
-                       dim.wid = std::max(dim0.width(), dim1.wid) + 2;
+                       dim.wid = max(dim0.width(), dim1.wid) + 2;
                        dim.asc = dim0.height() + 2 + 5;
                        dim.des = dim1.height() + 2 - 5;
                }
        }
        metricsMarkers(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -242,13 +242,13 @@ void InsetMathFrac::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
        Dimension dim0, dim1;
        cell(0).metricsT(mi, dim0);
        cell(1).metricsT(mi, dim1);
-       dim.wid = std::max(dim0.width(), dim1.wid);
+       dim.wid = max(dim0.width(), dim1.wid);
        dim.asc = dim0.height() + 1;
        dim.des = dim1.height();
 }
 
 
-void InsetMathFrac::drawT(TextPainter & pain, int x, int y) const
+void InsetMathFrac::drawT(TextPainter & /*pain*/, int /*x*/, int /*y*/) const
 {
        // FIXME: BROKEN!
        /*
@@ -368,11 +368,9 @@ void InsetMathDFrac::metrics(MetricsInfo & mi, Dimension & dim) const
        Dimension dim0, dim1;
        cell(0).metrics(mi, dim0);
        cell(1).metrics(mi, dim1);
-       dim.wid = std::max(dim0.wid, dim1.wid) + 2;
+       dim.wid = max(dim0.wid, dim1.wid) + 2;
        dim.asc = dim0.height() + 2 + 5;
        dim.des = dim1.height() + 2 - 5;
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -428,11 +426,9 @@ void InsetMathTFrac::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(0).metrics(mi, dim0);
        Dimension dim1;
        cell(1).metrics(mi, dim1);
-       dim.wid = std::max(dim0.width(), dim1.width()) + 2;
+       dim.wid = max(dim0.width(), dim1.width()) + 2;
        dim.asc = dim0.height() + 2 + 5;
        dim.des = dim1.height() + 2 - 5;
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -506,10 +502,8 @@ void InsetMathBinom::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(1).metrics(mi, dim1);
        dim.asc = dim0.height() + 4 + 5;
        dim.des = dim1.height() + 4 - 5;
-       dim.wid = std::max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
+       dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
        metricsMarkers2(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -580,10 +574,8 @@ void InsetMathDBinom::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(1).metrics(mi, dim1);
        dim.asc = dim0.height() + 4 + 5;
        dim.des = dim1.height() + 4 - 5;
-       dim.wid = std::max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
+       dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
        metricsMarkers2(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -650,10 +642,8 @@ void InsetMathTBinom::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(1).metrics(mi, dim1);
        dim.asc = dim0.height() + 4 + 5;
        dim.des = dim1.height() + 4 - 5;
-       dim.wid = std::max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
+       dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
        metricsMarkers2(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }