X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=b854cbebd4777261cf64a34933582264efe469b9;hb=45e3a8f82701e981b1ccb2ab8d76f269867d7889;hp=507213a5ab98f4679155e139b7800a041191a9a7;hpb=4fb8e9b6393ad5fe5af12cfcdd18a62b11e032b6;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 507213a5ab..b854cbebd4 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -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 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);
@@ -210,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