X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.cpp;h=16ae9aecb6e0f988535493cd8f5841f2ef2e039a;hb=5366666c831b6ad726e848a60d738b57ec8b0501;hp=0d92c94199642d1e5e58036b6fa12bf9a50eb9a0;hpb=ff7cdf1b74f5c17a966af24dc70d49fc162f007e;p=lyx.git

diff --git a/src/Row.cpp b/src/Row.cpp
index 0d92c94199..16ae9aecb6 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -26,8 +26,9 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
+#include "support/lyxlib.h"
 
+#include <algorithm>
 #include <ostream>
 
 using namespace std;
@@ -161,7 +162,6 @@ pos_type Row::Element::right_pos() const
 
 Row::Row()
 	: separator(0), label_hfill(0), left_margin(0), right_margin(0),
-	  top_padding(0), bottom_padding(0),
 	  sel_beg(-1), sel_end(-1),
 	  begin_margin_sel(false), end_margin_sel(false),
 	  changed_(true),
@@ -298,7 +298,7 @@ int Row::left_x() const
 		x += cit->full_width();
 		++cit;
 	}
-	return int(x + 0.5);
+	return support::iround(x);
 }
 
 
@@ -314,7 +314,7 @@ int Row::right_x() const
 		else
 			break;
 	}
-	return int(x + 0.5);
+	return support::iround(x);
 }
 
 
@@ -336,7 +336,7 @@ bool Row::setExtraWidth(int w)
 	// amount of expansion: number of expanders time the em value for each
 	// string element
 	int exp_amount = 0;
-	for (Row::Element const & e : elements_)
+	for (Element const & e : elements_)
 		exp_amount += e.expansionAmount();
 	if (!exp_amount)
 		return false;
@@ -346,8 +346,8 @@ bool Row::setExtraWidth(int w)
 		// do not stretch more than MAX_SPACE_STRETCH em per expander
 		return false;
 	// add extra length to each element proportionally to its em.
-	for (Row::Element & e : elements_)
-		if (e.type == Row::STRING)
+	for (Element & e : elements_)
+		if (e.type == STRING)
 			e.setExtra(extra_per_em);
 	// update row dimension
 	dim_.wid += w;
@@ -624,17 +624,19 @@ Row::findElement(pos_type const pos, bool const boundary, double & x) const
 			&& !begin()->isVirtual()))
 		return begin();
 
-	Row::const_iterator cit = begin();
+	const_iterator cit = begin();
 	for ( ; cit != end() ; ++cit) {
-		/** Look whether the cursor is inside the element's
-		 * span. Note that it is necessary to take the
-		 * boundary into account, and to accept virtual
-		 * elements, which have pos == endpos.
+		/** Look whether the cursor is inside the element's span. Note
+		 * that it is necessary to take the boundary into account, and
+		 * to accept virtual elements, in which case the position
+		 * will be before the virtual element.
 		 */
-		if (pos + boundary_corr >= cit->pos
-		    && (pos + boundary_corr < cit->endpos || cit->isVirtual())) {
-				x += cit->pos2x(pos);
-				break;
+		if (cit->isVirtual() && pos + boundary_corr == cit->pos)
+			break;
+		else if (pos + boundary_corr >= cit->pos
+		         && pos + boundary_corr < cit->endpos) {
+			x += cit->pos2x(pos);
+			break;
 		}
 		x += cit->full_width();
 	}