Bug [#2466]. Avoid dwell start when mouse moved outside the Scintilla widget.

3 files changed, 12 insertions, 0 deletions

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 2eb053855..a5640ea70 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -586,6 +586,7 @@
       </tr><tr>
 	<td>Pawel Z Wronek</td>
 	<td>Joachim Mairboeck</td>
+	<td>Gianluca Vaccari</td>
     </tr>
     </table>
     <h2 id="Releases">Releases</h2>
@@ -604,6 +605,10 @@
 	On Qt, draw clipped UTF-8 text correctly.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2464/">Bug #2464</a>.
 	</li>
+	<li>
+	On Qt, avoid a dwell start when the mouse is moved outside the Scintilla widget.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2466/">Bug #2466</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla555.zip">Release 5.5.5</a>
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 9cd131d42..c1733607b 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -373,6 +373,12 @@ void ScintillaEditBase::mouseMoveEvent(QMouseEvent *event)
 	sqt->ButtonMoveWithModifiers(pos, TimeOfEvent(time), modifiers);
 }
 
+void ScintillaEditBase::leaveEvent(QEvent *event)
+{
+	QWidget::leaveEvent(event);
+	sqt->MouseLeave();
+}
+
 void ScintillaEditBase::contextMenuEvent(QContextMenuEvent *event)
 {
 	const Point pos = PointFromQPoint(event->globalPos());
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index ba2d6ea9d..bccd67ffa 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -141,6 +141,7 @@ protected:
 	void mouseReleaseEvent(QMouseEvent *event) override;
 	void mouseDoubleClickEvent(QMouseEvent *event) override;
 	void mouseMoveEvent(QMouseEvent *event) override;
+	void leaveEvent(QEvent *event) override;
 	void contextMenuEvent(QContextMenuEvent *event) override;
 	void dragEnterEvent(QDragEnterEvent *event) override;
 	void dragLeaveEvent(QDragLeaveEvent *event) override;