X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=b854cbebd4777261cf64a34933582264efe469b9;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=4e9fc0dc2d05fc5955a4790356b2cd1f79fe3eca;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 4e9fc0dc2d..b854cbebd4 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -35,7 +35,7 @@ class TextMetrics
 {
 public:
 	/// Default constructor (only here for STL containers).
-	TextMetrics() : text_(0) {}
+	TextMetrics() : bv_(0), text_(0), max_width_(0) {}
 	/// The only useful constructor.
 	TextMetrics(BufferView *, Text *);
 
@@ -104,9 +104,6 @@ public:
 	/// current text height.
 	int height() const { return dim_.height(); }
 
-	///
-	int maxWidth() const { return max_width_; }
-
 	///
 	int rightMargin(ParagraphMetrics const & pm) const;
 	int rightMargin(pit_type const pit) const;
@@ -116,31 +113,33 @@ public:
 
 	void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
-	/// Returns the height of the row (width member is set to 0).
-	/// If \c topBottomSpace is true, extra space is added for the
-	/// top and bottom row.
-	void setRowHeight(Row & row, pit_type const pit,
-			  bool topBottomSpace = true) const;
-
 private:
 	///
 	ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
 
 	/// the minimum space a manual label needs on the screen in pixels
-	int labelFill(pit_type const pit, Row const & row) const;
+	int labelFill(Row const & row) const;
 
 	/// FIXME??
 	int labelEnd(pit_type const pit) const;
 
 	/// sets row.end to the pos value *after* which a row should break.
 	/// for example, the pos after which isNewLine(pos) == true
-	void breakRow(Row & row, int right_margin, pit_type const pit) const;
+	/// \return true when another row is required (after a newline)
+	bool breakRow(Row & row, int right_margin) const;
 
-	// Expand the alignment of paragraph \param par at position \param pos
-	LyXAlignment getAlign(Paragraph const & par, pos_type pos) const;
+	// Expand the alignment of row \param row in paragraph \param par
+	LyXAlignment getAlign(Paragraph const & par, Row const & row) const;
 	/** this calculates the specified parameters. needed when setting
 	 * the cursor and when creating a visible row */
-	void computeRowMetrics(pit_type pit, Row & row, int width) const;
+	void computeRowMetrics(Row & row, int width) const;
+
+	/// Set the height of the row (without space above/below paragraph)
+	void setRowHeight(Row & row) const;
+	// Compute the space on top of a paragraph
+	int parTopSpacing(pit_type pit) const;
+	// Compute the space below a a paragraph
+	int parBottomSpacing(pit_type pit) const;
 
 	// Helper function for the other checkInsetHit method.
 	InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y);
@@ -150,7 +149,7 @@ private:
 public:
 	/// returns the position near the specified x-coordinate of the row.
 	/// x is an absolute screen coord, it is set to the real beginning
-	/// of this column.
+	/// of this column. This takes in account horizontal cursor row scrolling.
 	pos_type getPosNearX(Row const & row, int & x, bool & boundary) const;
 
 	/// returns pos in given par at given x coord.
@@ -178,7 +177,7 @@ public:
 	\param x,y are absolute screen coordinates.
 	\param assert_in_view if true the cursor will be set on a row
            that is completely visible
-    \param up whether we are going up or down (only used when
+	\param up whether we are going up or down (only used when
            assert_in_view is true
 	\retval inset is non-null if the cursor is positionned inside
 	*/
@@ -191,12 +190,16 @@ public:
 	/// x,y are screen coordinates
 	void setCursorFromCoordinates(Cursor & cur, int x, int y);
 
+	/// Helper function: find row element that contains pos, and
+	/// compute x offset.
+	Row::const_iterator const
+	findRowElement(Row const & row, pos_type const pos,
+                   bool const boundary, double & x) const;
+
 	///
-	int cursorX(CursorSlice const & cursor,
-		bool boundary) const;
+	int cursorX(CursorSlice const & cursor, bool boundary) const;
 	///
-	int cursorY(CursorSlice const & cursor,
-		bool boundary) const;
+	int cursorY(CursorSlice const & cursor, bool boundary) const;
 
 	///
 	bool cursorHome(Cursor & cur);
@@ -206,9 +209,9 @@ public:
 	void deleteLineForward(Cursor & cur);
 
 	/// is this row the last in the text?
-	bool isLastRow(pit_type pit, Row const & row) const;
+	bool isLastRow(Row const & row) const;
 	/// is this row the first in the text?
-	bool isFirstRow(pit_type pit, Row const & row) const;
+	bool isFirstRow(Row const & row) const;
 
 	/// Returns an inset if inset was hit, or 0 if not.
 	/// \warning This method is not recursive! It will return the
@@ -239,7 +242,6 @@ private:
 	/// \todo FIXME: this should be const.
 	Text * text_;
 
-	bool main_text_;
 	/// A map from paragraph index number to paragraph metrics
 	typedef std::map<pit_type, ParagraphMetrics> ParMetricsCache;
 	///