more cursor dispatch

[lyx.git] / src / lyxrow.h

diff --git a/src/lyxrow.h b/src/lyxrow.h
index e7c1183958acb70fb816be65a10b42b937bee228..56f3430e2650db865636b106fa32b91bb1ad6852 100644 (file)
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -7,7 +7,7 @@
  * \author Matthias Ettrich
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * Metrics for an on-screen text row.
  */
@@ -15,7 +15,6 @@
 #ifndef LYXROW_H
 #define LYXROW_H
 
-#include "ParagraphList.h"
 #include "support/types.h"
 
 ///
@@ -24,33 +23,31 @@ public:
        ///
        Row();
        ///
-       Row(ParagraphList::iterator pit, lyx::pos_type pos);
-       ///
-       void par(ParagraphList::iterator pit);
-       ///
-       ParagraphList::iterator par();
-       ///
-       ParagraphList::iterator par() const;
+       Row(lyx::pos_type pos);
        ///
        void pos(lyx::pos_type p);
        ///
        lyx::pos_type pos() const;
        ///
+       void endpos(lyx::pos_type p);
+       ///
+       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);
        ///
@@ -62,29 +59,55 @@ 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);
-private:
+       void y_offset(unsigned int newy) { y_offset_ = newy; }
+       ///
+       float x() const;
+       ///
+       void x(float);
        ///
-       ParagraphList::iterator pit_;
+       float fill_separator() const;
        ///
+       void fill_separator(float);
+       ///
+       float fill_hfill() const;
+       ///
+       void fill_hfill(float);
+       ///
+       float fill_label_hfill() const;
+       ///
+       void fill_label_hfill(float);
+       /// current debugging only
+       void dump(const char * = "") const;
+private:
+       /// first pos covered by this row
        lyx::pos_type pos_;
+       /// one behind last pos covered by this row
+       lyx::pos_type end_;
        /** what is missing to a full row. Can be negative.
          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
        unsigned int top_of_text_;
        ///
        unsigned int baseline_;
+       /// offet from left border
+       float x_;
+       ///
+       float fill_separator_;
+       ///
+       float fill_hfill_;
+       ///
+       float fill_label_hfill_;
 };
 
 #endif