* GuiView.C (updateTab): do not update early if current tab has

[lyx.git] / src / lyxrow.C

diff --git a/src/lyxrow.C b/src/lyxrow.C
index 21873a8ae0d7a96c945cda60f0a85d886c9907d8..179354bad84b0770f3799ff8075a4a9b6f33696e 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -1,32 +1,41 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 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>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxrow.h"
+#include "debug.h"
+
+
+namespace lyx {
+
+
+RowMetrics::RowMetrics()
+       : separator(0), hfill(0), label_hfill(0), x(0)
+{}
 
 
 Row::Row()
-       : par_(0), pos_(0), fill_(0), height_(0), width_(0),
-         ascent_of_text_(0), baseline_(0), next_(0), previous_(0)
+       : pos_(0), end_(0), ascent_(0), descent_(0), width_(0)
 {}
 
 
-void Row::par(Paragraph * p)
-{
-       par_ = p;
-}
+Row::Row(pos_type pos)
+       : pos_(pos), end_(0), ascent_(0), descent_(0), width_(0)
+{}
 
 
 void Row::pos(pos_type p)
@@ -35,79 +44,56 @@ void Row::pos(pos_type p)
 }
 
 
-Row::pos_type Row::pos() const
+pos_type Row::pos() const
 {
        return pos_;
 }
 
 
-void Row::fill(int f)
-{
-       fill_ = f;
-}
-
-
-int Row::fill() const
+void Row::endpos(pos_type p)
 {
-       return fill_;
+       end_ = p;
 }
 
 
-void Row::height(unsigned short h)
+pos_type Row::endpos() const
 {
-       height_ = h;
+       return end_;
 }
 
 
-void Row::width(unsigned int w)
+void Row::width(int w)
 {
        width_ = w;
 }
 
 
-unsigned int Row::width() const
+int Row::width() const
 {
        return width_;
 }
 
 
-void Row::ascent_of_text(unsigned short a)
+void Row::ascent(int b)
 {
-       ascent_of_text_ = a;
+       ascent_ = b;
 }
 
 
-unsigned short Row::ascent_of_text() const
+int Row::ascent() const
 {
-       return ascent_of_text_;
+       return ascent_;
 }
 
 
-void Row::baseline(unsigned int b)
+void Row::dump(const char * s) const
 {
-       baseline_ = b;
+       lyxerr << s << " pos: " << pos_ << " end: " << end_
+               << " width: " << width_
+               << " ascent: " << ascent_
+               << " descent: " << descent_
+               << std::endl;
 }
 
 
-unsigned int Row::baseline() const
-{
-       return baseline_;
-}
-
-
-void Row::next(Row * r)
-{
-       next_ = r;
-}
-
-
-void Row::previous(Row * r)
-{
-       previous_ = r;
-}
-
-
-Row * Row::previous() const
-{
-       return previous_;
-}
+} // namespace lyx