Remove hardcoded values

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

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 9b4a5ded13691a736ff86574263a8963c9b2a243..f7fd6ea2aa20300162d2e8da059131322b378705 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -37,7 +37,7 @@ namespace lyx {
 
 
 InsetMathDecoration::InsetMathDecoration(Buffer * buf, latexkeys const * key)
-       : InsetMathNest(buf, 1), key_(key)
+       : InsetMathNest(buf, 1), key_(key), dh_(0), dy_(0), dw_(0)
 {
 //     lyxerr << " creating deco " << key->name << endl;
 }
@@ -59,13 +59,7 @@ bool InsetMathDecoration::isScriptable() const
 {
        return
                        key_->name == "overbrace" ||
-                       key_->name == "underbrace" ||
-                       key_->name == "overleftarrow" ||
-                       key_->name == "overrightarrow" ||
-                       key_->name == "overleftrightarrow" ||
-                       key_->name == "underleftarrow" ||
-                       key_->name == "underrightarrow" ||
-                       key_->name == "underleftrightarrow";
+                       key_->name == "underbrace";
 }
 
 
@@ -111,9 +105,10 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       bool really_change_font = currentMode() == TEXT_MODE
-                               && isMathFont(from_ascii(mi.base.fontname));
-       FontSetChanger dummy(mi.base, "textnormal", really_change_font);
+       Changer dummy =
+               (currentMode() == MATH_MODE) ? mi.base.changeEnsureMath() :
+               (isMathFont(mi.base.fontname)) ? mi.base.changeFontSet("textnormal")
+               : Changer();
 
        cell(0).metrics(mi, dim);
 
@@ -128,15 +123,16 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.des += dh_ + 2;
        }
 
-       metricsMarkers(dim);
+       metricsMarkers(mi, dim);
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
-       bool really_change_font = currentMode() == TEXT_MODE
-                               && isMathFont(from_ascii(pi.base.fontname));
-       FontSetChanger dummy(pi.base, "textnormal", really_change_font);
+       Changer dummy =
+               (currentMode() == MATH_MODE) ? pi.base.changeEnsureMath() :
+               (isMathFont(pi.base.fontname)) ? pi.base.changeFontSet("textnormal")
+               : Changer();
 
        cell(0).draw(pi, x + 1, y);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
@@ -146,7 +142,6 @@ void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
                mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2,
                        y + dy_, dw_, dh_, key_->name);
        drawMarkers(pi, x, y);
-       setPosCache(pi, x, y);
 }
 
 
@@ -175,7 +170,7 @@ void InsetMathDecoration::infoize(odocstream & os) const
 
 namespace {
        struct Attributes {
-               Attributes() {}
+               Attributes() : over(false) {}
                Attributes(bool o, string t)
                        : over(o), tag(t) {}
                bool over;