Bug fix; ensure that all is Ok after the combox is moved with

[lyx.git] / src / lyxrow.C

diff --git a/src/lyxrow.C b/src/lyxrow.C
index f5b816e511806188a79a45a0280f0619779e6464..5416e69b1b73d58cf6ce0e0be68befaaf125ec87 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -1,75 +1,64 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file lyxrow.C
+ * This file is part of LyX, the document processor.
+ * 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.
+ *
+ * Metrics for an on-screen text row.
+ */
 
 #include <config.h>
 
 #include "lyxrow.h"
+#include "debug.h"
 
-
-Row::Row()
-       : par_(0), pos_(0), fill_(0), height_(0), width_(0),
-         ascent_of_text_(0), baseline_(0), next_(0), previous_(0)
-{}
+using lyx::pos_type;
 
 
-void Row::par(LyXParagraph * p)
-{
-       par_ = p;
-}
+RowMetrics::RowMetrics() : separator(0), hfill(0), label_hfill(0), x(0)
+{}
 
 
-LyXParagraph * Row::par()
-{
-       return par_;
-}
+Row::Row()
+       : pos_(0), end_(0), height_(0), width_(0), y_offset_(0),
+         ascent_of_text_(0), baseline_(0)
+{}
 
 
-LyXParagraph * Row::par() const
-{
-       return par_;
-}
+Row::Row(pos_type pos)
+       : pos_(pos), end_(0), height_(0), width_(0), y_offset_(0),
+         ascent_of_text_(0), baseline_(0)
+{}
 
 
-void Row::pos(LyXParagraph::size_type p)
+void Row::pos(pos_type p)
 {
        pos_ = p;
 }
 
 
-LyXParagraph::size_type Row::pos() const
+pos_type Row::pos() const
 {
        return pos_;
 }
 
 
-void Row::fill(int f)
+void Row::endpos(pos_type p)
 {
-       fill_ = f;
+       end_ = p;
 }
 
 
-int Row::fill() const
+pos_type Row::endpos() const
 {
-       return fill_;
-}
-
-
-void Row::height(unsigned short h)
-{
-       height_ = h;
-}
-
-
-unsigned short Row::height() const
-{
-       return height_;
+       return end_;
 }
 
 
@@ -85,49 +74,53 @@ 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_;
 }
 
 
-void Row::baseline(unsigned int b)
+void Row::top_of_text(unsigned int top)
 {
-       baseline_ = b;
+       top_of_text_ = top;
 }
 
 
-unsigned int Row::baseline() const
+unsigned int Row::top_of_text() const
 {
-       return baseline_;
+       return top_of_text_;
 }
 
 
-void Row::next(Row * r)
+void Row::baseline(unsigned int b)
 {
-       next_ = r;
+       baseline_ = b;
 }
 
 
-Row * Row::next() const
+unsigned int Row::baseline() const
 {
-       return next_;
+       return baseline_;
 }
 
 
-void Row::previous(Row * r)
+bool Row::isParStart() const
 {
-       previous_ = r;
+       return !pos();
 }
 
 
-Row * Row::previous() const
+void Row::dump(const char * s) const
 {
-       return previous_;
+       lyxerr << s << " pos: " << pos_ << " width: " << width_
+               << " height: " << height_
+               << " ascent_of_text: " << ascent_of_text_
+               << " top_of_text: " << top_of_text_
+               << " y_offset: " << y_offset_ << std::endl;
 }