// -*- C++ -*-
/**
- * \file FontMetrics.h
+ * \file GuiFontMetrics.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef QT4_FONT_METRICS_H
-#define QT4_FONT_METRICS_H
+#ifndef GUI_FONT_METRICS_H
+#define GUI_FONT_METRICS_H
#include "frontends/FontMetrics.h"
#include <QFontMetrics>
#include <QHash>
-
namespace lyx {
namespace frontend {
-class GuiFontMetrics: public FontMetrics
+class GuiFontMetrics : public FontMetrics
{
public:
-
GuiFontMetrics(QFont const & font);
GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
virtual int descent(char_type c) const;
virtual int lbearing(char_type c) const;
virtual int rbearing(char_type c) const;
- virtual int width(char_type const * s, size_t n) const;
+ virtual int width(docstring const & s) const;
virtual int signedWidth(docstring const & s) const;
virtual Dimension const dimension(char_type c) const;
int width(QString const & str) const;
private:
- int smallcapsWidth(QString const & s) const;
+ int smallcapsWidth(char_type c) const;
/// Metrics on the font
QFontMetrics metrics_;
mutable QHash<char_type, int> width_cache_;
struct AscendDescend {
- short int ascent;
- short int descent;
+ int ascent;
+ int descent;
};
/// Cache of char ascends and descends
mutable QHash<char_type, AscendDescend> metrics_cache_;
/// fill in \c metrics_cache_ at specified value.
- void fillMetricsCache(char_type) const;
+ AscendDescend const fillMetricsCache(char_type) const;
+
+ /// Cache of char right bearings
+ mutable QHash<char_type, int> rbearing_cache_;
};
} // namespace frontend
} // namespace lyx
-#endif // QT4_FONT_METRICS_H
+#endif // GUI_FONT_METRICS_H