Change FontMetrics::breakAt to return a position

[features.git] / src / frontends / qt / GuiFontMetrics.h

diff --git a/src/frontends/qt/GuiFontMetrics.h b/src/frontends/qt/GuiFontMetrics.h
index c19a3cd426cbe10d2f3200acaa6860f635e30725..ef8588a5f81a57ad83688b0dc282ef09e9c506ff 100644 (file)
--- a/src/frontends/qt/GuiFontMetrics.h
+++ b/src/frontends/qt/GuiFontMetrics.h
@@ -27,6 +27,30 @@
 namespace lyx {
 namespace frontend {
 
+struct BreakAtKey
+{
+       bool operator==(BreakAtKey const & key) const {
+               return key.s == s && key.x == x && key.rtl == rtl && key.force == force;
+       }
+
+       docstring s;
+       int x;
+       bool rtl;
+       bool force;
+};
+
+struct TextLayoutKey
+{
+       bool operator==(TextLayoutKey const & key) const {
+               return key.s == s && key.rtl == rtl && key.ws == ws;
+       }
+
+       docstring s;
+       bool rtl;
+       double ws;
+};
+
+
 class GuiFontMetrics : public FontMetrics
 {
 public:
@@ -34,39 +58,39 @@ public:
 
        virtual ~GuiFontMetrics() {}
 
-       virtual int maxAscent() const;
-       virtual int maxDescent() const;
-       virtual Dimension const defaultDimension() const;
-       virtual int em() const;
-       virtual int xHeight() const;
-       virtual int lineWidth() const;
-       virtual int underlinePos() const;
-       virtual int strikeoutPos() const;
-       virtual bool italic() const;
-       virtual double italicSlope() const;
-       virtual int width(char_type c) const;
-       virtual int ascent(char_type c) const;
-       virtual int descent(char_type c) const;
-       virtual int lbearing(char_type c) const;
-       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,
+       int maxAscent() const override;
+       int maxDescent() const override;
+       Dimension const defaultDimension() const override;
+       int em() const override;
+       int xHeight() const override;
+       int lineWidth() const override;
+       int underlinePos() const override;
+       int strikeoutPos() const override;
+       bool italic() const override;
+       double italicSlope() const override;
+       int width(char_type c) const override;
+       int ascent(char_type c) const override;
+       int descent(char_type c) const override;
+       int lbearing(char_type c) const override;
+       int rbearing(char_type c) const override;
+       int width(docstring const & s) const override;
+       int signedWidth(docstring const & s) const override;
+       int pos2x(docstring const & s, int pos, bool rtl, double ws) const override;
+       int x2pos(docstring const & s, int & x, bool rtl, double ws) const override;
+       int breakAt(docstring const & s, int & x, bool rtl, bool force) const override;
+       Dimension const dimension(char_type c) const override;
+
+       void rectText(docstring const & str,
                int & width,
                int & ascent,
-               int & descent) const;
-       virtual void buttonText(docstring const & str,
+               int & descent) const override;
+       void buttonText(docstring const & str,
                const int offset,
                int & width,
                int & ascent,
-               int & descent) const;
+               int & descent) const override;
 
-       int countExpanders(docstring const & str) const;
+       int countExpanders(docstring const & str) const override;
        ///
        int width(QString const & str) const;
 
@@ -94,9 +118,9 @@ private:
        /// Cache of string widths
        mutable Cache<docstring, int> strwidth_cache_;
        /// Cache for breakAt
-       mutable Cache<docstring, std::pair<int, int>> breakat_cache_;
+       mutable Cache<BreakAtKey, std::pair<int, int>> breakat_cache_;
        /// Cache for QTextLayout
-       mutable Cache<docstring, std::shared_ptr<QTextLayout>> qtextlayout_cache_;
+       mutable Cache<TextLayoutKey, std::shared_ptr<QTextLayout>> qtextlayout_cache_;
 
        struct AscendDescend {
                int ascent;