Amend f441590c

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

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index 5da137e742e2905172069fc3740e228adb2a1104..8c8daab5cd97aa3d54053df78a318d668910d1fe 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -16,8 +16,12 @@
 
 #include "support/docstring.h"
 
+#include <QByteArray>
+#include <QCache>
+#include <QFont>
 #include <QFontMetrics>
 #include <QHash>
+#include <QTextLayout>
 
 namespace lyx {
 namespace frontend {
@@ -26,13 +30,16 @@ class GuiFontMetrics : public FontMetrics
 {
 public:
        GuiFontMetrics(QFont const & font);
-       GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
 
        virtual ~GuiFontMetrics() {}
 
        virtual int maxAscent() const;
        virtual int maxDescent() const;
        virtual Dimension const defaultDimension() const;
+       virtual int em() const;
+       virtual int lineWidth() const;
+       virtual int underlinePos() const;
+       virtual int strikeoutPos() const;
        virtual int width(char_type c) const;
        virtual int ascent(char_type c) const;
        virtual int descent(char_type c) const;
@@ -40,6 +47,9 @@ public:
        virtual int rbearing(char_type c) const;
        virtual int width(docstring const & s) const;
        virtual int signedWidth(docstring const & s) const;
+       virtual int pos2x(docstring const & s, int pos, bool rtl, double ws) const;
+       virtual int x2pos(docstring const & s, int & x, bool rtl, double ws) const;
+       virtual bool breakAt(docstring & s, int & x, bool rtl, bool force) const;
        virtual Dimension const dimension(char_type c) const;
 
        virtual void rectText(docstring const & str,
@@ -54,17 +64,23 @@ public:
        int width(QString const & str) const;
 
 private:
-       int smallcapsWidth(char_type c) const;
+
+       QTextLayout const &
+       getTextLayout(docstring const & s, QFont font,
+                     bool const rtl, double const wordspacing) const;
+
+       /// The font
+       QFont font_;
 
        /// Metrics on the font
        QFontMetrics metrics_;
-       QFontMetrics smallcaps_metrics_;
-
-       bool smallcaps_shape_;
 
        /// Cache of char widths
        mutable QHash<char_type, int> width_cache_;
 
+       /// Cache of string widths
+       mutable QCache<QByteArray, int> strwidth_cache_;
+
        struct AscendDescend {
                int ascent;
                int descent;
@@ -76,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