Update toolbar and properly reset focus when find widget is closed (#12396)

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

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index 8358e2eb1eadbf70204c7a3443006c4a828d3319..2a6ffead8a9043771dbb9c4147b7aae625230a33 100644 (file)
--- a/src/frontends/FontMetrics.h
+++ b/src/frontends/FontMetrics.h
@@ -65,6 +65,8 @@ public:
        virtual Dimension const defaultDimension() const = 0;
        /// return the em size
        virtual int em() const = 0;
+       /// return the x height
+       virtual int xHeight() const = 0;
        /// return the width of a line for underlining
        virtual int lineWidth() const = 0;
        /// return the distance from the base line to where an underline
@@ -73,27 +75,41 @@ public:
        /// return the distance from the base line to where the strike out line
        /// should be drawn.
        virtual int strikeoutPos() const = 0;
+       /// return true if font is not upright (italic or oblique)
+       virtual bool italic() const = 0;
+       /// return slope for italic font
+       virtual double italicSlope() const = 0;
 
-       /// return the width of the char in the font
-       virtual int width(char_type c) const = 0;
        /// return the ascent of the char in the font
        virtual int ascent(char_type c) const = 0;
        /// return the descent of the char in the font
        virtual int descent(char_type c) const = 0;
+       /// return the maximum height of the font
+       inline int maxHeight() const { return maxAscent() + maxDescent(); }
+       /// return the height of the char in the font
+       inline int height(char_type c) const { return ascent(c) + descent(c); }
+
        /// return the left bearing of the char in the font
        virtual int lbearing(char_type c) const = 0;
        /// return the right bearing of the char in the font
        virtual int rbearing(char_type c) const = 0;
+       /// return the width of the char in the font
+       virtual int width(char_type c) const = 0;
        /// return the width of the string in the font
        virtual int width(docstring const & s) const = 0;
        /// FIXME ??
        virtual int signedWidth(docstring const & s) const = 0;
+       /// return the inner width of the char in the font
+       inline int center(char_type c) const {
+               return (rbearing(c) - lbearing(c)) / 2;
+       }
+
        /**
         * return the x offset of a position in the string. The
         * direction of the string is forced, and the returned value
         * is from the left edge of the word, not from the start of the string.
         * \param rtl is true for right-to-left layout
-        * \param ws is the amount of extra inter-word space applied text justication.
+        * \param ws is the amount of extra inter-word space applied text justification.
         */
        virtual int pos2x(docstring const & s, int pos, bool rtl, double ws) const = 0;
        /**
@@ -102,7 +118,7 @@ public:
         * is from the left edge of the word, not from the start of the string.
         * the offset x is updated to match the closest position in the string.
         * \param rtl is true for right-to-left layout
-        * \param ws is the amount of extra inter-word space applied text justication.
+        * \param ws is the amount of extra inter-word space applied text justification.
         */
        virtual int x2pos(docstring const & s, int & x, bool rtl, double ws) const = 0;
        /**
@@ -125,24 +141,14 @@ public:
                int & descent) const = 0;
        /**
         * fill in width,ascent,descent with the values for the
-        * given string in the font for a button.
+        * given string in the font for a button with given offset.
         */
        virtual void buttonText(docstring const & str,
+               const int offset,
                int & width,
                int & ascent,
                int & descent) const = 0;
 
-       /// return the maximum descent of the font
-       inline int maxHeight() const { return maxAscent() + maxDescent(); }
-
-       /// return the descent of the char in the font
-       inline int height(char_type c) const { return ascent(c) + descent(c); }
-
-       /// return the inner width of the char in the font
-       inline int center(char_type c) const {
-               return (rbearing(c) - lbearing(c)) / 2;
-       }
-
        /// return the number of expanding characters taken into account for
        /// increased inter-word spacing during justification
        virtual int countExpanders(docstring const & str) const = 0;