revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 7409a28ca7dae1b0b764b4170b9a65d525efb08d..777fa75aca29b07b014cf601f5889e1a2db4c11a 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -12,15 +12,18 @@
 #include <config.h>
 
 #include "InsetMathDecoration.h"
+
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathSupport.h"
 #include "MathStream.h"
+#include "MetricsInfo.h"
 
 #include "LaTeXFeatures.h"
-#include "debug.h"
 
-#include "support/std_ostream.h"
+#include "support/debug.h"
+
+#include <ostream>
 
 
 namespace lyx {
@@ -29,13 +32,13 @@ namespace lyx {
 InsetMathDecoration::InsetMathDecoration(latexkeys const * key)
        : InsetMathNest(1), key_(key)
 {
-//     lyxerr << " creating deco " << key->name << std::endl;
+//     lyxerr << " creating deco " << key->name << endl;
 }
 
 
-std::auto_ptr<Inset> InsetMathDecoration::doClone() const
+Inset * InsetMathDecoration::clone() const
 {
-       return std::auto_ptr<Inset>(new InsetMathDecoration(*this));
+       return new InsetMathDecoration(*this);
 }
 
 
@@ -101,7 +104,7 @@ bool InsetMathDecoration::ams() const
 }
 
 
-bool InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
 
@@ -117,20 +120,17 @@ bool InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
        }
 
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
        cell(0).draw(pi, x + 1, y);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        if (wide())
-               mathed_draw_deco(pi, x + 1, y + dy_, cell(0).width(), dh_, key_->name);
+               mathed_draw_deco(pi, x + 1, y + dy_, dim0.wid, dh_, key_->name);
        else
-               mathed_draw_deco(pi, x + 1 + (cell(0).width() - dw_) / 2,
+               mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2,
                        y + dy_, dw_, dh_, key_->name);
        drawMarkers(pi, x, y);
        setPosCache(pi, x, y);