X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.h;h=9039ff8860e9d40c2b52cd7b817de8bec8229f8b;hb=3bb588f4aaa810fa9cf00a93cf1bd6015cc4d8cf;hp=04890f70657cfe1197e49d87277e4812776cf3fe;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/src/Row.h b/src/Row.h
index 04890f7065..9039ff8860 100644
--- a/src/Row.h
+++ b/src/Row.h
@@ -76,7 +76,7 @@ public:
 			  extra(0), font(f), change(ch), final(false) {}
 
 		// Return total width of element, including separator overhead
-		double width() const { return dim.wid + extra; };
+		double full_width() const { return dim.wid + extra; };
 		/** Return position in pixels (from the left) of position
 		 * \param i in the row element.
 		 */
@@ -85,11 +85,11 @@ public:
 		 *  pixel position \param x. The value \param x is
 		 *  adjusted to the actual pixel position.
 		*/
-		pos_type x2pos(double &x) const;
+		pos_type x2pos(int &x) const;
 		/** Break the element if possible, so that its width is
 		 * less then \param w. Returns true on success.
 		 */
-		bool breakAt(double w);
+		bool breakAt(int w);
 
 		// Returns the position on left side of the element.
 		pos_type left_pos() const;
@@ -165,7 +165,7 @@ public:
 	Dimension & dimension() { return dim_; }
 	///
 	int height() const { return dim_.height(); }
-	///
+	/// The width of the row, including the left margin, but not the right one.
 	int width() const { return dim_.wid; }
 	///
 	int ascent() const { return dim_.asc; }
@@ -243,8 +243,8 @@ public:
 	double separator;
 	/// width of hfills in the label
 	double label_hfill;
-	/// the x position of the row (left margin)
-	double x;
+	/// the left margin position of the row
+	int left_margin;
 	/// the right margin of the row
 	int right_margin;
 	///