From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 6 Apr 2017 13:13:24 +0000 (+0200)
Subject: Row::Element::x2pos: go to nearest point also over insets
X-Git-Tag: 2.3.0alpha1~109
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8769c0fb750a8c46e6f053c5f73b3991393dcd73;p=features.git

Row::Element::x2pos: go to nearest point also over insets

getPosNearX, which is the only user of x2pos, should always return the
nearest position.

In editXY, there is a need to return the position where the inset
stands, but it is done using checkInsetHit.

This is a simplification of commit eb4a2a19, which has been reverted
at 01f0ab64a.

Fixes part of bug #10569.
---

diff --git a/src/Row.cpp b/src/Row.cpp
index 70e3dcafc3..3557957a77 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -115,14 +115,13 @@ pos_type Row::Element::x2pos(int &x) const
 	case SPACE:
 		// those elements contain only one position. Round to
 		// the closest side.
-		if (x > full_width()) {
+		if (x > full_width() / 2) {
 			x = int(full_width());
 			i = !isRTL();
 		} else {
 			x = 0;
 			i = isRTL();
 		}
-
 	}
 	//lyxerr << "=> p=" << pos + i << " x=" << x << endl;
 	return pos + i;