Point fix, earlier forgotten

[lyx.git] / src / lyxrow.C

diff --git a/src/lyxrow.C b/src/lyxrow.C
index 40adfda74840f3bb25ce44dd84b84cacde57e842..a93192a5fb83a990ac3b8b3c1cf7a22d90d369c5 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -4,8 +4,12 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
- * 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.
  */
@@ -22,34 +26,18 @@ using std::min;
 
 Row::Row()
        : pos_(0), end_(0), fill_(0), height_(0), width_(0), y_(0),
-         ascent_of_text_(0), baseline_(0)
+         ascent_of_text_(0), baseline_(0),
+         x_(0), fill_separator_(0), fill_hfill_(0), fill_label_hfill_(0)
 {}
 
 
 Row::Row(pos_type pos)
        : pos_(pos), end_(0), fill_(0), height_(0), width_(0), y_(0),
-         ascent_of_text_(0), baseline_(0)
+         ascent_of_text_(0), baseline_(0),
+         x_(0), fill_separator_(0), fill_hfill_(0), fill_label_hfill_(0)
 {}
 
 
-void Row::y(unsigned int newy)
-{
-       y_ = newy;
-}
-
-
-unsigned int Row::y() const
-{
-       return y_;
-}
-
-
-unsigned short Row::height() const
-{
-       return height_;
-}
-
-
 void Row::pos(pos_type p)
 {
        pos_ = p;
@@ -86,12 +74,6 @@ int Row::fill() const
 }
 
 
-void Row::height(unsigned short h)
-{
-       height_ = h;
-}
-
-
 void Row::width(unsigned int w)
 {
        width_ = w;
@@ -104,13 +86,13 @@ unsigned int Row::width() const
 }
 
 
-void Row::ascent_of_text(unsigned short a)
+void Row::ascent_of_text(unsigned int a)
 {
        ascent_of_text_ = a;
 }
 
 
-unsigned short Row::ascent_of_text() const
+unsigned int Row::ascent_of_text() const
 {
        return ascent_of_text_;
 }
@@ -140,6 +122,54 @@ unsigned int Row::baseline() const
 }
 
 
+float Row::x() const
+{
+       return x_;
+}
+
+
+void Row::x(float f)
+{
+       x_ = f;
+}
+
+
+float Row::fill_separator() const
+{
+       return fill_separator_;
+}
+
+
+void Row::fill_separator(float f)
+{
+       fill_separator_ = f;
+}
+
+
+float Row::fill_hfill() const
+{
+       return fill_hfill_;
+}
+
+
+void Row::fill_hfill(float f)
+{
+       fill_hfill_ = f;
+}
+
+
+float Row::fill_label_hfill() const
+{
+       return fill_label_hfill_;
+}
+
+
+void Row::fill_label_hfill(float f)
+{
+       fill_label_hfill_ = f;
+}
+
+
 bool Row::isParStart() const
 {
        return !pos();