X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=3000b218bfc44a914d1d51b27028d24b55be5bdd;hb=d706a2a291c5d2bae141010d9f161098ed6beb6a;hp=eef00ffd4dbd5fbd71f421f07e1857f5be9f3dbf;hpb=b917c4e40f9f5cd3d101444600eddafcca54d6e3;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index eef00ffd4d..3000b218bf 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -94,6 +94,8 @@ public:
 	bool redoParagraph(pit_type const pit);
 	/// Clear cache of paragraph metrics
 	void clear() { par_metrics_.clear(); }
+	/// Is cache of paragraph metrics empty ?
+	bool empty() const { return par_metrics_.empty(); }
 
 	///
 	int ascent() const { return dim_.asc; }
@@ -113,31 +115,42 @@ 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);
 
+	/**
+	 * Returns the left beginning of the text.
+	 * This information cannot be taken from the layout object, because
+	 * in LaTeX the beginning of the text fits in some cases
+	 * (for example sections) exactly the label-width.
+	 */
+	int leftMargin(pit_type pit, pos_type pos) const;
+	int leftMargin(pit_type pit) const;
+
 	/// 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);
@@ -177,7 +190,9 @@ public:
            that is completely visible
 	\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
+	\retval inset is null if the cursor is positioned over normal
+	       text in the current Text object. Otherwise it is the inset
+	       that the cursor points to, like for Inset::editXY.
 	*/
 	/// FIXME: cleanup to use BufferView::getCoveringInset() and
 	/// setCursorFromCoordinates() instead of checkInsetHit().
@@ -188,12 +203,6 @@ 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;
 	///
@@ -207,9 +216,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
@@ -217,15 +226,6 @@ public:
 	/// \sa BufferView::getCoveringInset() to get the innermost inset.
 	Inset * checkInsetHit(int x, int y);
 
-	/**
-	 * Returns the left beginning of the text.
-	 * This information cannot be taken from the layout object, because
-	 * in LaTeX the beginning of the text fits in some cases
-	 * (for example sections) exactly the label-width.
-	 */
-	int leftMargin(int max_width, pit_type pit, pos_type pos) const;
-	int leftMargin(int max_width, pit_type pit) const;
-
 	/// calculates the position of a completion popup
 	void completionPosAndDim(Cursor const & cur, int & x, int & y,
 		Dimension & dim) const;