From dec3e9e7991c51374846f1be80c81fde3412836c Mon Sep 17 00:00:00 2001
From: johnsonj <unknown>
Date: Thu, 15 Jun 2023 15:18:19 +1000
Subject: For IMEs, update micro focus when selection changes.

---
 doc/ScintillaHistory.html                  | 4 ++++
 qt/ScintillaEditBase/ScintillaEditBase.cpp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index eaecc0075..e84d43cb0 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -597,6 +597,10 @@
 	On Win32 hide cursor when typing if that system preference has been chosen.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2333/">Bug #2333</a>.
 	</li>
+	<li>
+	On Qt, for IMEs, update micro focus when selection changes.
+	This may move the location of IME popups to align with the caret.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla535.zip">Release 5.3.5</a>
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 416d74416..b64070407 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -712,6 +712,9 @@ void ScintillaEditBase::notifyParent(NotificationData scn)
 			break;
 
 		case Notification::UpdateUI:
+			if (FlagSet(scn.updated, Update::Selection)) {
+				updateMicroFocus();
+			}
 			emit updateUi(scn.updated);
 			break;
 
-- 
cgit v1.2.3