Remove cached var from RenderPreview. Changes elsewhere to suit.

[lyx.git] / src / lyxrow.h

diff --git a/src/lyxrow.h b/src/lyxrow.h
index 56f3430e2650db865636b106fa32b91bb1ad6852..d855d77e30942f745ed2698a2a20ac98c2084cfb 100644 (file)
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -33,10 +33,6 @@ public:
        ///
        lyx::pos_type endpos() const;
        ///
-       void fill(int f);
-       ///
-       int fill() const;
-       ///
        void height(unsigned int h) { height_ = h; }
        ///
        unsigned int height() const { return height_; }
@@ -62,32 +58,14 @@ public:
        unsigned int y_offset() const { return y_offset_; }
        /// cache the y position
        void y_offset(unsigned int newy) { y_offset_ = newy; }
-       ///
-       float x() const;
-       ///
-       void x(float);
-       ///
-       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 int height_;
        ///
@@ -100,14 +78,21 @@ private:
        unsigned int top_of_text_;
        ///
        unsigned int baseline_;
-       /// offet from left border
-       float x_;
-       ///
-       float fill_separator_;
-       ///
-       float fill_hfill_;
-       ///
-       float fill_label_hfill_;
 };
 
+
+class RowMetrics {
+public:
+       RowMetrics();
+       /// width of a separator (i.e. space)
+       double separator;
+       /// width of hfills in the body
+       double hfill;
+       /// width of hfills in the label
+       double label_hfill;
+       /// the x position of the row
+       double x;
+};
+
+
 #endif