Make string-widget combination more l7n friendly

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

diff --git a/src/frontends/qt/GuiFontMetrics.h b/src/frontends/qt/GuiFontMetrics.h
index e9af0ddcd690d954ff33411c2b5cd1a43c4c798a..5c32ea9de89237cc9e6822ff50b1cb4ed84c86b9 100644 (file)
--- a/src/frontends/qt/GuiFontMetrics.h
+++ b/src/frontends/qt/GuiFontMetrics.h
@@ -27,6 +27,34 @@
 namespace lyx {
 namespace frontend {
 
+struct TextLayoutHelper;
+
+struct BreakStringKey
+{
+       bool operator==(BreakStringKey const & key) const {
+               return key.s == s && key.first_wid == first_wid && key.wid == wid
+                       && key.rtl == rtl && key.force == force;
+       }
+
+       docstring s;
+       int first_wid;
+       int wid;
+       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:
@@ -53,7 +81,7 @@ public:
        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;
-       bool breakAt(docstring & s, int & x, bool rtl, bool force) const override;
+       Breaks breakString(docstring const & s, int first_wid, int wid, bool rtl, bool force) const override;
        Dimension const dimension(char_type c) const override;
 
        void rectText(docstring const & str,
@@ -66,19 +94,21 @@ public:
                int & ascent,
                int & descent) const override;
 
-       int countExpanders(docstring const & str) const override;
        ///
        int width(QString const & str) const;
 
        /// Return a pointer to a cached QTextLayout object
        std::shared_ptr<QTextLayout const>
-       getTextLayout(docstring const & s, bool const rtl,
-                     double const wordspacing) const;
+       getTextLayout(docstring const & s, bool const rtl, double const wordspacing) const;
 
 private:
 
-       std::pair<int, int> breakAt_helper(docstring const & s, int const x,
-                                          bool const rtl, bool const force) const;
+       Breaks breakString_helper(docstring const & s, int first_wid, int wid,
+                                 bool rtl, bool force) const;
+
+       /// A different version of getTextLayout for internal use
+       std::shared_ptr<QTextLayout const>
+       getTextLayout(TextLayoutHelper const & tlh, double const wordspacing) const;
 
        /// The font
        QFont font_;
@@ -93,10 +123,10 @@ private:
        mutable QHash<char_type, int> width_cache_;
        /// Cache of string widths
        mutable Cache<docstring, int> strwidth_cache_;
-       /// Cache for breakAt
-       mutable Cache<docstring, std::pair<int, int>> breakat_cache_;
+       /// Cache for breakString
+       mutable Cache<BreakStringKey, Breaks> breakstr_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;