From 706b3f5a9b8c7192983d20ff726f040cc0fa8966 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Wed, 10 Aug 2011 19:53:34 +1000
Subject: Fix for wrong cursor near selection ends when scrolled horizontally.
 Bug #3389055.

---
 src/Editor.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Editor.cxx')

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 452666be7..f6b1ea308 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -6020,20 +6020,20 @@ bool Editor::PositionInSelection(int pos) {
 
 bool Editor::PointInSelection(Point pt) {
 	SelectionPosition pos = SPositionFromLocation(pt, false, true);
-	int xPos = XFromPosition(pos);
+	Point ptPos = LocationFromPosition(pos);
 	for (size_t r=0; r<sel.Count(); r++) {
 		SelectionRange range = sel.Range(r);
 		if (range.Contains(pos)) {
 			bool hit = true;
 			if (pos == range.Start()) {
 				// see if just before selection
-				if (pt.x < xPos) {
+				if (pt.x < ptPos.x) {
 					hit = false;
 				}
 			}
 			if (pos == range.End()) {
 				// see if just after selection
-				if (pt.x > xPos) {
+				if (pt.x > ptPos.x) {
 					hit = false;
 				}
 			}
-- 
cgit v1.2.3


From 22edeb6d8fd99407534b4f630266ed5c904cf6a1 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sun, 4 Sep 2011 09:47:19 +1000
Subject: Cast to ensure comparison valid.

---
 src/Editor.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Editor.cxx')

diff --git a/src/Editor.cxx b/src/Editor.cxx
index f6b1ea308..347f27318 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -8378,7 +8378,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		return vs.caretStyle;
 
 	case SCI_SETCARETWIDTH:
-		if (wParam <= 0)
+		if (static_cast<int>(wParam) <= 0)
 			vs.caretWidth = 0;
 		else if (wParam >= 3)
 			vs.caretWidth = 3;
-- 
cgit v1.2.3