more cursor dispatch

[lyx.git] / src / lyxrow.h

diff --git a/src/lyxrow.h b/src/lyxrow.h
index b68b91b0764570aa23b21ad454a037fd168cd804..56f3430e2650db865636b106fa32b91bb1ad6852 100644 (file)
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -29,25 +29,25 @@ public:
        ///
        lyx::pos_type pos() const;
        ///
-       void end(lyx::pos_type p);
+       void endpos(lyx::pos_type p);
        ///
-       lyx::pos_type end() const;
+       lyx::pos_type endpos() const;
        ///
        void fill(int f);
        ///
        int fill() const;
        ///
-       void height(unsigned short h);
+       void height(unsigned int h) { height_ = h; }
        ///
-       unsigned short height() const;
+       unsigned int height() const { return height_; }
        ///
        void width(unsigned int w);
        ///
        unsigned int width() const;
        ///
-       void ascent_of_text(unsigned short a);
+       void ascent_of_text(unsigned int a);
        ///
-       unsigned short ascent_of_text() const;
+       unsigned int ascent_of_text() const;
        ///
        void top_of_text(unsigned int top);
        ///
@@ -59,9 +59,9 @@ public:
        /// return true if this row is the start of a paragraph
        bool isParStart() const;
        /// return the cached y position
-       unsigned int y() const;
+       unsigned int y_offset() const { return y_offset_; }
        /// cache the y position
-       void y(unsigned int newy);
+       void y_offset(unsigned int newy) { y_offset_ = newy; }
        ///
        float x() const;
        ///
@@ -89,11 +89,11 @@ private:
          Needed for hfills, flushright, block etc. */
        mutable int fill_;
        ///
-       unsigned short height_;
+       unsigned int height_;
        ///
        unsigned int width_;
        /// cached y position
-       unsigned int y_;
+       unsigned int y_offset_;
        /// ascent from baseline including prelude space
        unsigned short ascent_of_text_;
        /// the top of the real text in the row