Fix event loop to no longer eat CPU

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

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index a73dbb78fffa906a6f64bf7c2149ac443f943799..ee440305b9785a6575717b6250650b2e229aaadb 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -1,15 +1,24 @@
-#include <config.h>
+/**
+ * \file math_fontinset.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_fontinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
 #include "math_parser.h"
 #include "LaTeXFeatures.h"
-#include "support/LOstream.h"
-#include "textpainter.h"
+#include "support/std_ostream.h"
 
+using std::string;
+using std::auto_ptr;
 
 
 MathFontInset::MathFontInset(latexkeys const * key)
@@ -17,9 +26,9 @@ MathFontInset::MathFontInset(latexkeys const * key)
 {}
 
 
-MathInset * MathFontInset::clone() const
+auto_ptr<InsetBase> MathFontInset::doClone() const
 {
-       return new MathFontInset(*this);
+       return auto_ptr<InsetBase>(new MathFontInset(*this));
 }
 
 
@@ -33,11 +42,12 @@ MathInset::mode_type MathFontInset::currentMode() const
 }
 
 
-void MathFontInset::metrics(MetricsInfo & mi) const
+void MathFontInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontSetChanger dummy(mi.base, key_->name.c_str());
-       dim_ = cell(0).metrics(mi);
-       metricsMarkers();
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -46,12 +56,13 @@ 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) const
+void MathFontInset::metricsT(TextMetricsInfo const & mi, Dimension &) const
 {
-       dim_ = cell(0).metricsT(mi);
+       cell(0).metricsT(mi, dim_);
 }
 
 
@@ -74,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");
 }