X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=66d310fcc60ef4164c23152341d88b2385da8f3f;hb=1d6573a330791fb34541f4092cd49e4559972489;hp=34eda6b2de971a1e01ddf60ebb75cabfab734896;hpb=c7c1db84bdb454d590af4489504a6af6ed26729e;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 34eda6b2de..66d310fcc6 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  * \author Abdelrazak Younes
  *
@@ -38,7 +38,7 @@ public:
 	TextMetrics(BufferView *, Text *);
 	
 	///
-	bool has(pit_type pit) const;
+	bool contains(pit_type pit) const;
 	///
 	ParagraphMetrics const & parMetrics(pit_type) const;
 	///
@@ -46,9 +46,6 @@ public:
 	///
 	std::pair<pit_type, ParagraphMetrics const *> last() const;
 
-	///
-	int parPosition(pit_type pit) const;
-
 	///
 	Dimension const & dimension() const { return dim_; }
 	///
@@ -68,8 +65,7 @@ public:
 	/// The difference is that this one is used for displaying, and thus we
 	/// are allowed to make cosmetic improvements. For instance make footnotes
 	/// smaller. (Asger)
-	Font getDisplayFont(pit_type pit,
-		pos_type pos) const;
+	Font displayFont(pit_type pit, pos_type pos) const;
 
 	/// There are currently two font mechanisms in LyX:
 	/// 1. The font attributes in a lyxtext, and
@@ -103,7 +99,7 @@ public:
 	int descent() const { return dim_.des; }
 	/// current text width.
 	int width() const { return dim_.wid; }
-	/// current text heigth.
+	/// current text height.
 	int height() const { return dim_.height(); }
 
 	///
@@ -124,6 +120,15 @@ 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.
+	Dimension rowHeight(
+		pit_type const pit,
+		pos_type const first,
+		pos_type const end,
+		bool topBottomSpace = true) const;
+
 private:
 	///
 	ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
@@ -136,13 +141,13 @@ private:
 
 	/// sets row.end to the pos value *after* which a row should break.
 	/// for example, the pos after which isNewLine(pos) == true
-	pit_type rowBreakPoint(
+	pos_type rowBreakPoint(
 		int width,
 		pit_type const pit,
-		pit_type first
+		pos_type first
 		) const;
 
-	/// sets row.width to the minimum space a row needs on the screen in pixel
+	/// returns the minimum space a row needs on the screen in pixel
 	int rowWidth(
 		int right_margin,
 		pit_type const pit,
@@ -150,18 +155,6 @@ private:
 		pos_type const end
 		) const;
 
-	/// Calculate and set the height of the row (width member is set to 0)
-	Dimension rowHeight(
-		pit_type const pit,
-		pos_type const first,
-		pos_type const end
-		) const;
-
-	/// draw selection for a single row
-	void drawRowSelection(PainterInfo & pi, int x, Row const & row,
-		DocIterator const & beg, DocIterator const & end, 
-		bool drawOnBegMargin, bool drawOnEndMargin) const;
-
 // Temporary public:
 public:
 	/// returns the column near the specified x-coordinate of the row.
@@ -176,11 +169,11 @@ public:
 	// FIXME: is there a need for this?
 	//int pos2x(pit_type pit, pos_type pos) const;
 
-	/** returns row near the specified
-	  * y-coordinate in given paragraph (relative to the screen).
-	  */
-	Row const & getRowNearY(int y,
-		pit_type pit) const;
+	/// returns the row near the specified y-coordinate in a given paragraph
+	/// (relative to the screen). If assert_in_view is true, it is made sure
+	/// that the row is on screen completely; this might change the given pit.
+	Row const & getPitAndRowNearY(int & y, pit_type & pit,
+		bool assert_in_view, bool up);
 
 	/// returns the paragraph number closest to screen y-coordinate.
 	/// This method uses the BufferView CoordCache to locate the
@@ -193,11 +186,16 @@ public:
 	/**
 	\return the inset pointer if x,y is covering that inset
 	\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
+           assert_in_view is true
 	\retval inset is non-null if the cursor is positionned inside
 	*/
 	/// FIXME: cleanup to use BufferView::getCoveringInset() and
 	/// setCursorFromCoordinates() instead of checkInsetHit().
-	Inset * editXY(Cursor & cur, int x, int y);
+	Inset * editXY(Cursor & cur, int x, int y,
+		bool assert_in_view = false, bool up = true);
 
 	/// sets cursor only within this Text.
 	/// x,y are screen coordinates
@@ -210,10 +208,6 @@ public:
 	int cursorY(CursorSlice const & cursor,
 		bool boundary) const;
 
-	///
-	void cursorPrevious(Cursor & cur);
-	///
-	void cursorNext(Cursor & cur);
 	///
 	bool cursorHome(Cursor & cur);
 	///
@@ -241,6 +235,10 @@ public:
 	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;
+
 private:
 	friend class BufferView;