Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Row.h

diff --git a/src/Row.h b/src/Row.h
index a51e3ceb912cefef657b80c71a83ddd3238d929f..f69eeca9f17ae9b83e4d24fafbafdbb105d1a133 100644 (file)
--- a/src/Row.h
+++ b/src/Row.h
@@ -62,6 +62,7 @@ public:
                          extra(0), font(f), change(ch), final(false) {}
 
                // Return total width of element, including separator overhead
+               // FIXME: Cache this value or the number of separators?
                double full_width() const { return dim.wid + extra * countSeparators(); }
                // Return the number of separator in the element (only STRING type)
                int countSeparators() const;
@@ -144,6 +145,10 @@ public:
        void setSelectionAndMargins(DocIterator const & beg,
                DocIterator const & end) const;
 
+       ///
+       void pit(pit_type p) { pit_ = p; }
+       ///
+       pit_type pit() const { return pit_; }
        ///
        void pos(pos_type p) { pos_ = p; }
        ///
@@ -170,6 +175,11 @@ public:
        ///
        int descent() const { return dim_.des; }
 
+       /// The offset of the left-most cursor position on the row
+       int left_x() const;
+       /// The offset of the right-most cursor position on the row
+       int right_x() const;
+
        // Return the number of separators in the row
        int countSeparators() const;
        // Set the extra spacing for every separator in STRING elements
@@ -222,8 +232,9 @@ public:
         * 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
+        * \return true if the row has been shortened.
         */
-       void shortenIfNeeded(pos_type const body_pos, int const width);
+       bool shortenIfNeeded(pos_type const body_pos, int const width);
 
        /**
         * If last element of the row is a string, compute its width
@@ -280,6 +291,8 @@ private:
        mutable bool changed_;
        /// CRC of row contents.
        mutable size_type crc_;
+       /// Index of the paragraph that contains this row
+       pit_type pit_;
        /// first pos covered by this row
        pos_type pos_;
        /// one behind last pos covered by this row