Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index 2ffacba941361f8ebd00e7900c528d57c9afc6aa..ee440305b9785a6575717b6250650b2e229aaadb 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -26,7 +26,7 @@ MathFontInset::MathFontInset(latexkeys const * key)
 {}
 
 
-auto_ptr<InsetBase> MathFontInset::clone() const
+auto_ptr<InsetBase> MathFontInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathFontInset(*this));
 }
@@ -45,9 +45,9 @@ MathInset::mode_type MathFontInset::currentMode() const
 void MathFontInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontSetChanger dummy(mi.base, key_->name.c_str());
-       cell(0).metrics(mi, dim_);
-       metricsMarkers(1);
-       dim = dim_;
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -56,10 +56,11 @@ void MathFontInset::draw(PainterInfo & pi, int x, int y) const
        FontSetChanger dummy(pi.base, key_->name.c_str());
        cell(0).draw(pi, x + 1, y);
        drawMarkers(pi, x, y);
+       setPosCache(pi, x, y);
 }
 
 
-void MathFontInset::metricsT(TextMetricsInfo const & mi, Dimension & /*dim*/) const
+void MathFontInset::metricsT(TextMetricsInfo const & mi, Dimension &) const
 {
        cell(0).metricsT(mi, dim_);
 }
@@ -84,6 +85,8 @@ void MathFontInset::validate(LaTeXFeatures & features) const
        // Fraktur used:
        if (key_->name == "mathfrak" || key_->name == "mathbb")
                features.require("amssymb");
+       if (key_->name == "text")
+               features.require("amsmath");
 }