From: Jean-Marc <lasgouttes@lyx.org>
Date: Mon, 28 Jul 2014 20:03:57 +0000 (+0200)
Subject: Fix display of cursor at end of row
X-Git-Tag: 2.2.0alpha1~1748
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=46ee67995d9bd1836463eeadb3b341c925061752;p=features.git

Fix display of cursor at end of row

The particular case here is:
* the last element of the row is an inset
* the row is broken by a display inset.
---

diff --git a/src/Row.cpp b/src/Row.cpp
index cab3ab750c..34be0529aa 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -47,10 +47,10 @@ double Row::Element::pos2x(pos_type const i) const
 
 	double w = 0;
 	//handle first the two bounds of the element
-	if (i == pos || type != STRING)
-		w = rtl ? width() : 0;
-	else if (i == endpos)
+	if (i == endpos)
 		w = rtl ? 0 : width();
+	else if (i == pos || type != STRING)
+		w = rtl ? width() : 0;
 	else {
 		FontMetrics const & fm = theFontMetrics(font);
 		w = fm.pos2x(str, i - pos, font.isVisibleRightToLeft());