Re-implement text justification

[features.git] / src / Row.h

diff --git a/src/Row.h b/src/Row.h
index 04890f70657cfe1197e49d87277e4812776cf3fe..77dcbb5f75c984adb02f62130dab44e73efc3578 100644 (file)
--- a/src/Row.h
+++ b/src/Row.h
@@ -76,7 +76,10 @@ public:
                          extra(0), font(f), change(ch), final(false) {}
 
                // Return total width of element, including separator overhead
-               double width() const { return dim.wid + extra; };
+               double full_width() const { return dim.wid + extra * countSeparators(); };
+               // Return the number of separator in the element (only STRING type)
+               int countSeparators() const;
+
                /** Return position in pixels (from the left) of position
                 * \param i in the row element.
                 */
@@ -85,11 +88,13 @@ public:
                 *  pixel position \param x. The value \param x is
                 *  adjusted to the actual pixel position.
                */
-               pos_type x2pos(double &x) const;
-               /** Break the element if possible, so that its width is
-                * less then \param w. Returns true on success.
+               pos_type x2pos(int &x) const;
+               /** Break the element if possible, so that its width is less
+                * than \param w. Returns true on success. When \param force
+                * is true, the string is cut at any place, other wise it
+                * respects the row breaking rules of characters.
                 */
-               bool breakAt(double w);
+               bool breakAt(int w, bool force);
 
                // Returns the position on left side of the element.
                pos_type left_pos() const;
@@ -165,13 +170,18 @@ public:
        Dimension & dimension() { return dim_; }
        ///
        int height() const { return dim_.height(); }
-       ///
+       /// The width of the row, including the left margin, but not the right one.
        int width() const { return dim_.wid; }
        ///
        int ascent() const { return dim_.asc; }
        ///
        int descent() const { return dim_.des; }
 
+       // Return the number of separators in the row
+       int countSeparators() const;
+       // Set the extra spacing for every separator in STRING elements
+       void setSeparatorExtraWidth(double w);
+
        ///
        void add(pos_type pos, Inset const * ins, Dimension const & dim,
                 Font const & f, Change const & ch);
@@ -243,8 +253,8 @@ public:
        double separator;
        /// width of hfills in the label
        double label_hfill;
-       /// the x position of the row (left margin)
-       double x;
+       /// the left margin position of the row
+       int left_margin;
        /// the right margin of the row
        int right_margin;
        ///