Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C
index 960ccc2ab6afb246847885ddcbb1249d07c8d5ed..4705ae78461cf74f8c202dc4f061c2f2a74d57ce 100644 (file)
--- a/src/mathed/math_sqrtinset.C
+++ b/src/mathed/math_sqrtinset.C
@@ -1,9 +1,23 @@
+/**
+ * \file math_sqrtinset.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.
+ */
+
+#include <config.h>
 
 #include "math_sqrtinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "textpainter.h"
 #include "LColor.h"
 #include "frontends/Painter.h"
-#include "textpainter.h"
+
+using std::auto_ptr;
 
 
 MathSqrtInset::MathSqrtInset()
@@ -11,44 +25,44 @@ MathSqrtInset::MathSqrtInset()
 {}
 
 
-MathInset * MathSqrtInset::clone() const
+auto_ptr<InsetBase> MathSqrtInset::doClone() const
 {
-       return new MathSqrtInset(*this);
+       return auto_ptr<InsetBase>(new MathSqrtInset(*this));
 }
 
 
-void MathSqrtInset::metrics(MathMetricsInfo & mi) const
+void MathSqrtInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(0).metrics(mi);
-       dim_.a = cell(0).ascent()  + 4;
-       dim_.d = cell(0).descent() + 2;
-       dim_.w = cell(0).width()   + 12;
-       metricsMarkers();
+       cell(0).metrics(mi, dim);
+       dim.asc += 4;
+       dim.des += 2;
+       dim.wid += 12;
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathSqrtInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathSqrtInset::draw(PainterInfo & pi, int x, int y) const
 {
        cell(0).draw(pi, x + 10, y);
-       int const a = ascent();
-       int const d = descent();
+       int const a = dim_.ascent();
+       int const d = dim_.descent();
        int xp[4];
        int yp[4];
-       xp[0] = x + width(); yp[0] = y - a + 1;
-       xp[1] = x + 8;       yp[1] = y - a + 1;
-       xp[2] = x + 5;       yp[2] = y + d - 1;
-       xp[3] = x;           yp[3] = y + (d - a)/2;
+       xp[0] = x + dim_.width(); yp[0] = y - a + 1;
+       xp[1] = x + 8;            yp[1] = y - a + 1;
+       xp[2] = x + 5;            yp[2] = y + d - 1;
+       xp[3] = x;                yp[3] = y + (d - a)/2;
        pi.pain.lines(xp, yp, 4, LColor::math);
        drawMarkers(pi, x, y);
 }
 
 
-void MathSqrtInset::metricsT(TextMetricsInfo const & mi) const
+void MathSqrtInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
-       cell(0).metricsT(mi);
-       dim_.a = cell(0).ascent()  + 1;
-       dim_.d = cell(0).descent();
-       dim_.w = cell(0).width()   + 2;
+       cell(0).metricsT(mi, dim);
+       dim.asc += 1;
+       dim.wid += 2;
 }