From 20184b70992e72b4ad26f93284f9654cb29c01e2 Mon Sep 17 00:00:00 2001
From: Nathaniel Braun <unknown>
Date: Mon, 9 Mar 2026 16:22:44 +1100
Subject: Feature [feature-requests:#1581]. Improve mouse drag behaviour when
 drag and drop disabled to deselect on mouse down.

---
 doc/ScintillaHistory.html | 4 ++++
 src/Editor.cxx            | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index c1a77ed67..470fc64aa 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -608,6 +608,10 @@
 	<li>
 	Add mode to draw tabs as [HT] blobs with SCI_SETTABDRAWMODE(SCTD_CONTROLCHAR).
 	</li>
+	<li>
+	Improve mouse drag behaviour when drag and drop disabled.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1581/">Feature #1581</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla560.zip">Release 5.6.0</a>
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 0289fa5e5..318131110 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4920,7 +4920,9 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, KeyMod modi
 						SetSelection(newPos, newPos);
 					}
 					if (!sel.Range(selectionPart).Empty()) {
-						inDragDrop = DragDrop::initial;
+						if (dragDropEnabled) {
+							inDragDrop = DragDrop::initial;
+						}
 					}
 				}
 			}
-- 
cgit v1.2.3