Add cached fontmetrics to UiStyle

[quassel.git] / src / uisupport / uistyle.h

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index b3e1a96..cd6458e 100644 (file)
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -22,6 +22,7 @@
 #define _UISTYLE_H_
 
 #include <QDataStream>
+#include <QFontMetricsF>
 #include <QTextCharFormat>
 #include <QTextLayout>
 #include <QUrl>
@@ -36,7 +37,7 @@ class UiStyle {
     UiStyle(const QString &settingsKey);
     virtual ~UiStyle();
 
-    typedef QList<QPair<int, quint32> > FormatList;
+    typedef QList<QPair<quint16, quint32> > FormatList;
 
     //! This enumerates the possible formats a text element may have. */
     /** These formats are ordered on increasing importance, in cases where a given property is specified
@@ -133,20 +134,25 @@ class UiStyle {
     void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/);
     QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const;
     QTextCharFormat mergedFormat(quint32 formatType);
+    QFontMetricsF *fontMetrics(quint32 formatType);
 
     FormatType formatType(const QString &code) const;
     QString formatCode(FormatType) const;
 
+    inline QFont defaultFont() const { return _defaultFont; }
+
   protected:
 
 
   private:
     QString mircToInternal(const QString &);
 
+    QFont _defaultFont;
     QTextCharFormat _defaultPlainFormat;
     QHash<FormatType, QTextCharFormat> _defaultFormats;
     QHash<FormatType, QTextCharFormat> _customFormats;
     QHash<quint32, QTextCharFormat> _cachedFormats;
+    QHash<quint32, QFontMetricsF *> _cachedFontMetrics;
     QHash<QString, FormatType> _formatCodes;
 
     QString _settingsKey;