Amend f441590c

[lyx.git] / src / frontends / qt4 / GuiFontMetrics.h

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index 75507b0c99cf1abdcc68b2cca28e806ac7e3cfa8..8c8daab5cd97aa3d54053df78a318d668910d1fe 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -16,11 +16,12 @@
 
 #include "support/docstring.h"
 
-#include <map>
-
+#include <QByteArray>
+#include <QCache>
 #include <QFont>
 #include <QFontMetrics>
 #include <QHash>
+#include <QTextLayout>
 
 namespace lyx {
 namespace frontend {
@@ -63,6 +64,11 @@ public:
        int width(QString const & str) const;
 
 private:
+
+       QTextLayout const &
+       getTextLayout(docstring const & s, QFont font,
+                     bool const rtl, double const wordspacing) const;
+
        /// The font
        QFont font_;
 
@@ -73,8 +79,7 @@ private:
        mutable QHash<char_type, int> width_cache_;
 
        /// Cache of string widths
-       /// FIXME Try to use a QHash (this requires to define qHash(docstring))
-       mutable std::map<docstring, int> strwidth_cache_;
+       mutable QCache<QByteArray, int> strwidth_cache_;
 
        struct AscendDescend {
                int ascent;
@@ -87,6 +92,14 @@ private:
 
        /// Cache of char right bearings
        mutable QHash<char_type, int> rbearing_cache_;
+
+       // A trivial QTextLayout cache
+       mutable QTextLayout tl_cache_;
+       mutable docstring tl_cache_s_;
+       mutable QFont tl_cache_font_;
+       mutable bool tl_cache_rtl_;
+       mutable double tl_cache_wordspacing_;
+
 };
 
 } // namespace frontend