enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / font_metrics.h

diff --git a/src/frontends/font_metrics.h b/src/frontends/font_metrics.h
index d873b02b513025c654537e216e3236c6b62a0675..9c6becdab9085e3a6b76aa861c404cf7e370119b 100644 (file)
--- a/src/frontends/font_metrics.h
+++ b/src/frontends/font_metrics.h
@@ -13,7 +13,8 @@
 #ifndef FONT_METRICS_H
 #define FONT_METRICS_H
 
-#include "LString.h"
+#include "support/docstring.h"
+
 
 class LyXFont;
 
@@ -45,32 +46,47 @@ namespace font_metrics {
        int maxAscent(LyXFont const & f);
        /// return the maximum descent of the font
        int maxDescent(LyXFont const & f);
+       /// return the maximum descent of the font
+       inline int maxHeight(LyXFont const & f) {
+               return maxAscent(f) + maxDescent(f);
+       }
        /// return the ascent of the char in the font
-       int ascent(char c, LyXFont const & f);
+       int ascent(lyx::char_type c, LyXFont const & f);
        /// return the descent of the char in the font
-       int descent(char c, LyXFont const & f);
+       int descent(lyx::char_type c, LyXFont const & f);
+       /// return the descent of the char in the font
+       inline int height(lyx::char_type c, LyXFont const & f)
+       {
+               return ascent(c, f) + descent(c, f);
+       }
        /// return the left bearing of the char in the font
-       int lbearing(char c, LyXFont const & f);
+       int lbearing(lyx::char_type c, LyXFont const & f);
        /// return the right bearing of the char in the font
-       int rbearing(char c, LyXFont const & f);
+       int rbearing(lyx::char_type c, LyXFont const & f);
+       /// return the inner width of the char in the font
+       inline int center(lyx::char_type c, LyXFont const & f) {
+               return (rbearing(c, f) - lbearing(c, f)) / 2;
+       }
        /// return the width of the string in the font
-       int width(char const * s, size_t n, LyXFont const & f);
+       int width(lyx::char_type const * s, size_t n, LyXFont const & f);
        /// return the width of the char in the font
-       inline int width(char c, LyXFont const & f) {
-               return width(&c, 1, f);
+       inline int width(lyx::char_type c, LyXFont const & f)
+       {
+               lyx::char_type tmp[2] = { c, L'\0'};
+               return width(tmp, 1, f);
        }
        /// return the width of the string in the font
-       inline int width(string const & s, LyXFont const & f) {
-               if (s.empty()) return 0;
-               return width(s.data(), s.length(), f);
+       inline int width(lyx::docstring const & s, LyXFont const & f)
+       {
+           return s.empty() ? 0 : width(s.data(), s.length(), f);
        }
        /// FIXME ??
-       int signedWidth(string const & s, LyXFont const & f);
+       int signedWidth(lyx::docstring const & s, LyXFont const & f);
        /**
         * fill in width,ascent,descent with the values for the
         * given string in the font.
         */
-       void rectText(string const & str, LyXFont const & font,
+       void rectText(lyx::docstring const & str, LyXFont const & font,
                int & width,
                int & ascent,
                int & descent);
@@ -78,7 +94,7 @@ namespace font_metrics {
         * fill in width,ascent,descent with the values for the
         * given string in the font for a button.
         */
-       void buttonText(string const & str, LyXFont const & font,
+       void buttonText(lyx::docstring const & str, LyXFont const & font,
                int & width,
                int & ascent,
                int & descent);