Reintroduce the code related to InsetEnvSeparator

[lyx.git] / src / Row.h

diff --git a/src/Row.h b/src/Row.h
index 2282c82d93eac822105e8b2317f8f442117dbffb..a1e707e7449eaeabc9fe9d631459bc74c8638eec 100644 (file)
--- a/src/Row.h
+++ b/src/Row.h
@@ -63,19 +63,26 @@ public:
                        : type(t), pos(p), endpos(p + 1), inset(0),
                          extra(0), font(f), change(ch), final(false) {}
 
-               // returns total width of element, including separator overhead
+               // Return total width of element, including separator overhead
                double width() const { return dim.wid + extra; };
-               // returns position in pixels (from the left) of position
-               // \param i in the row element
+               /** Return position in pixels (from the left) of position
+                * \param i in the row element.
+                */
                double pos2x(pos_type const i) const;
-
                /** Return character position that is the closest to
                 *  pixel position \param x. The value \param x is
-                *  rounded to the actual pixel position. If \param
-                *  short is true, the pixel value is rounded by
-                *  default.
+                *  adjusted to the actual pixel position.
                */
-               pos_type x2pos(double &x, bool low = false) const;
+               pos_type x2pos(double &x) const;
+               /** Break the element if possible, so that its width is
+                * less then \param w. Returns true on success.
+                */
+               bool breakAt(double w);
+
+               // Returns the position on left side of the element.
+               pos_type left_pos() const;
+               // Returns the position on right side of the element.
+               pos_type right_pos() const;
 
                // The kind of row element
                Type type;
@@ -186,6 +193,10 @@ public:
        ///
        bool empty() const { return elements_.empty(); }
        ///
+       Element & front() { return elements_.front(); }
+       ///
+       Element const & front() const { return elements_.front(); }
+       ///
        Element & back() { return elements_.back(); }
        ///
        Element const & back() const { return elements_.back(); }
@@ -196,11 +207,11 @@ public:
        /**
         * if row width is too large, remove all elements after last
         * separator and update endpos if necessary. If all that
-        * rename is a large word, cut it to \param width.
+        * remains is a large word, cut it to \param width.
         * \param body_pos minimum amount of text to keep.
         * \param width maximum width of the row
         */
-       void shorten_if_needed(pos_type const body_pos, int const width);
+       void shortenIfNeeded(pos_type const body_pos, int const width);
 
        /**
         * If last element of the row is a string, compute its width