X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=6f5cf687336514ca747e6d298f557d5812bd59ed;hb=f5f8c6fd3828285b67e43a9c16d4ac2ff2140944;hp=e5b32a1904650c9e986d87604befa2abb09f70d4;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index e5b32a1904..6f5cf68733 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -16,6 +16,7 @@
 
 #include "Font.h"
 #include "InsetList.h"
+#include "LayoutEnums.h"
 #include "ParagraphMetrics.h"
 
 #include "support/types.h"
@@ -34,7 +35,7 @@ class TextMetrics
 {
 public:
 	/// Default constructor (only here for STL containers).
-	TextMetrics() : text_(0) {}
+	TextMetrics() : bv_(0), text_(0), main_text_(false), max_width_(0) {}
 	/// The only useful constructor.
 	TextMetrics(BufferView *, Text *);
 
@@ -135,8 +136,8 @@ private:
 	/// for example, the pos after which isNewLine(pos) == true
 	void breakRow(Row & row, int right_margin, pit_type const pit) const;
 
-	// Expand the alignment of paragraph \param par at position \param pos
-	int 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;
@@ -149,7 +150,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.
@@ -177,7 +178,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
 	*/
@@ -190,12 +191,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);
@@ -225,7 +230,7 @@ public:
 	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, 
+	void completionPosAndDim(Cursor const & cur, int & x, int & y,
 		Dimension & dim) const;
 
 private:
@@ -252,7 +257,7 @@ public:
 	/// our 'outermost' font.
 	/// This is handed down from the surrounding
 	/// inset through the pi/mi parameter (pi.base.font)
-	/// It is used in applyOuterFont() and setCharFont() for reasons 
+	/// It is used in applyOuterFont() and setCharFont() for reasons
 	/// that are not clear... to hand hand the outermost language and
 	/// also for char style apparently.
 	Font font_;