From eeb150883f74d5908872d71087814e73f4dd640e Mon Sep 17 00:00:00 2001
From: johnsonj <devnull@localhost>
Date: Sun, 13 Dec 2015 12:04:37 +1100
Subject: Korean input by word fixed.

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

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index c39e39a03..57680f59a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -538,7 +538,7 @@
 	to the end of the cluster making it easier to understand editing actions.
 	</li>
 	<li>
-	On GTK+, Korean input by word fixed.
+	On GTK+ and Qt, Korean input by word fixed.
 	</li>
 	<li>
 	On GTK+ on OS X, fix warning during destruction.
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 68cdc9e36..ea516fe17 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -564,11 +564,11 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
 		sqt->recordingMacro = recording;
 
 		// Move IME carets.
+		MoveImeCarets(- imeCharPos[preeditStrLen] + imeCharPos[imeCaretPos]);
+
 		if (IsHangul(preeditStr.at(0))) {
+			MoveImeCarets(- imeCharPos[1]);
 			sqt->view.imeCaretBlockOverride = true;
-			MoveImeCarets(- imeCharPos[preeditStrLen]);
-		} else {
-			MoveImeCarets(- imeCharPos[preeditStrLen] + imeCharPos[imeCaretPos]);
 		}
 
 		// Set candidate box position for Qt::ImMicroFocus.
-- 
cgit v1.2.3