Merge branch 'i5678' into next

nvaccess · Mar 2, 2016 · 07b2c92 · 07b2c92
2 parents 264900d + 8dc80aa
commit 07b2c92
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 298 deletions.
diff --git a/source/NVDAObjects/window/scintilla.py b/source/NVDAObjects/window/scintilla.py
@@ -12,6 +12,7 @@
 from ..behaviors import EditableTextWithAutoSelectDetection
 import locale
 import watchdog
+import eventHandler
 
 #Window messages
 SCI_POSITIONFROMPOINT=2022
@@ -124,6 +125,9 @@ def _getCaretOffset(self):
 
 	def _setCaretOffset(self,offset):
 		watchdog.cancellableSendMessage(self.obj.windowHandle,SCI_GOTOPOS,offset,0)
+		# #5678: A caret event sometimes doesn't get fired when we do this,
+		# so fake one just in case.
+		eventHandler.executeEvent("caret", self.obj)
 
 	def _getSelectionOffsets(self):
 		start=watchdog.cancellableSendMessage(self.obj.windowHandle,SCI_GETSELECTIONSTART,0,0)