move around stuff, remove unneeded declarations etc

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index 55e086241df32e6f780ee7666aa52a3e3be7df9c..25dd231ca4ab8fe5679d1dd8f2c111c24e9ba69e 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -12,18 +12,24 @@
 #include <config.h>
 
 #include "math_decorationinset.h"
+#include "math_data.h"
 #include "math_support.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "support/LOstream.h"
+
+#include "debug.h"
+
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 
 
 MathDecorationInset::MathDecorationInset(latexkeys const * key)
        : MathNestInset(1), key_(key)
-{}
+{
+//     lyxerr << " creating deco " << key->name << std::endl;
+}
 
 
 auto_ptr<InsetBase> MathDecorationInset::clone() const
@@ -86,22 +92,21 @@ bool MathDecorationInset::wide() const
 
 void MathDecorationInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(0).metrics(mi);
-       dim_ = cell(0).dim();
+       cell(0).metrics(mi, dim);
 
        dh_  = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
        dw_  = 6; //mathed_char_width(LM_TC_VAR, mi, 'x');
 
        if (upper()) {
-               dy_ = -dim_.asc - dh_;
-               dim_.asc += dh_ + 1;
+               dy_ = -dim.asc - dh_;
+               dim.asc += dh_ + 1;
        } else {
-               dy_ = dim_.des + 1;
-               dim_.des += dh_ + 2;
+               dy_ = dim.des + 1;
+               dim.des += dh_ + 2;
        }
 
-       metricsMarkers();
-       dim = dim_;
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -111,7 +116,7 @@ void MathDecorationInset::draw(PainterInfo & pi, int x, int y) const
        if (wide())
                mathed_draw_deco(pi, x + 1, y + dy_, cell(0).width(), dh_, key_->name);
        else
-               mathed_draw_deco(pi, x + 1 + (pi.width - dw_) / 2,
+               mathed_draw_deco(pi, x + 1 + (cell(0).width() - dw_) / 2,
                        y + dy_, dw_, dh_, key_->name);
        drawMarkers(pi, x, y);
 }