X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrow.h;h=d855d77e30942f745ed2698a2a20ac98c2084cfb;hb=005545f28100fd30afa22313d6e3b1b67aa9a857;hp=b6e036bbf9deb10901c2c457c89995b793f3b6f3;hpb=cd6e293ed7c588748fe0cf5927f46dc5e9ae6e35;p=lyx.git

diff --git a/src/lyxrow.h b/src/lyxrow.h
index b6e036bbf9..d855d77e30 100644
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -1,118 +1,98 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file lyxrow.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Matthias Ettrich
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ *
+ * Metrics for an on-screen text row.
+ */
 
 #ifndef LYXROW_H
 #define LYXROW_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "support/types.h"
 
-class Paragraph;
-
 ///
 class Row {
 public:
-	/// A position in the row
-	typedef lyx::pos_type pos_type;
 	///
 	Row();
 	///
-	void par(Paragraph * p);
-	///
-	Paragraph * par();
-	///
-	Paragraph * par() const;
+	Row(lyx::pos_type pos);
 	///
-	void pos(pos_type p);
+	void pos(lyx::pos_type p);
 	///
-	pos_type pos() const;
+	lyx::pos_type pos() const;
 	///
-	void fill(int f);
+	void endpos(lyx::pos_type p);
 	///
-	int fill() const;
+	lyx::pos_type endpos() 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 baseline(unsigned int b);
-	///
-	unsigned int baseline() const;
+	void top_of_text(unsigned int top);
 	///
-	void next(Row * r);
+	unsigned int top_of_text() const;
 	///
-	Row * next() const;
-	///
-	void previous(Row * r);
+	void baseline(unsigned int b);
 	///
-	Row * previous() const;
+	unsigned int baseline() const;
+	/// return true if this row is the start of a paragraph
+	bool isParStart() const;
+	/// return the cached y position
+	unsigned int y_offset() const { return y_offset_; }
+	/// cache the y position
+	void y_offset(unsigned int newy) { y_offset_ = newy; }
+	/// 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_;
 	///
-	Paragraph * par_;
-	///
-	pos_type pos_;
-	/** 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_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_;
-	///
-	Row * next_;
-	///
-	Row * previous_;
 };
 
 
-inline
-Paragraph * Row::par()
-{
-	return par_;
-}
-
-
-inline
-Paragraph * Row::par() const
-{
-	return par_;
-}
-
-
-inline
-unsigned short Row::height() const
-{
-	return height_;
-}
-
+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;
+};
 
-inline
-Row * Row::next() const
-{
-	return next_;
-}
 
 #endif