aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--src/Editor.cxx4
2 files changed, 7 insertions, 1 deletions
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;
+ }
}
}
}