X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrow.h;h=cc5ec0ed55c4a6e4dd62a7309ce94f8212047c34;hb=ae348f8af96100a154b3792d27732d621d44ec89;hp=2ad6a0577ed0fdc0aa4e43d060557f090850c238;hpb=a848fced972853b5942f64c14abb32c430502431;p=lyx.git

diff --git a/src/lyxrow.h b/src/lyxrow.h
index 2ad6a0577e..cc5ec0ed55 100644
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -7,7 +7,7 @@
  * \author Matthias Ettrich
  * \author Lars Gullik Bjønnes
  *
- * 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.
  */
@@ -15,78 +15,70 @@
 #ifndef LYXROW_H
 #define LYXROW_H
 
-#include "ParagraphList.h"
 #include "support/types.h"
 
-///
+/**
+ * An on-screen row of text. A paragraph is broken into a
+ * RowList for display. Each Row contains position pointers
+ * into the first and last character positions of that row.
+ */
 class Row {
 public:
 	///
 	Row();
 	///
-	Row(ParagraphList::iterator pit, lyx::pos_type pos);
-	///
-	void par(ParagraphList::iterator pit);
-	///
-	ParagraphList::iterator par();
-	///
-	ParagraphList::iterator par() const;
+	Row(lyx::pos_type pos);
 	///
 	void pos(lyx::pos_type p);
 	///
 	lyx::pos_type pos() const;
 	///
-	void fill(int f);
-	///
-	int fill() const;
-	///
-	void height(unsigned short h);
-	///
-	unsigned short height() const;
+	void endpos(lyx::pos_type p);
 	///
-	void width(unsigned int w);
+	lyx::pos_type endpos() const;
 	///
-	unsigned int width() const;
+	int height() const { return ascent_ + descent_; }
 	///
-	void ascent_of_text(unsigned short a);
+	void width(int w);
 	///
-	unsigned short ascent_of_text() const;
+	int width() const;
 	///
-	void top_of_text(unsigned int top);
+	void ascent(int b);
 	///
-	unsigned int top_of_text() const;
+	int ascent() const;
 	///
-	void baseline(unsigned int b);
+	void descent(int b) { descent_ = b; }
 	///
-	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() const;
-	/// cache the y position
-	void y(unsigned int newy);
+	int descent() const { return descent_; }
 	/// current debugging only
 	void dump(const char * = "") const;
+
 private:
-	///
-	ParagraphList::iterator pit_;
-	///
+	/// first pos covered by this row
 	lyx::pos_type pos_;
-	/** what is missing to a full row. Can be negative.
-	  Needed for hfills, flushright, block etc. */
-	mutable int fill_;
+	/// one behind last pos covered by this row
+	lyx::pos_type end_;
 	///
-	unsigned short height_;
+	int ascent_;
 	///
-	unsigned int width_;
-	/// cached y position
-	unsigned int y_;
-	/// 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_;
+	int descent_;
 	///
-	unsigned int baseline_;
+	int width_;
+};
+
+
+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