finishInputMethodComposition is only called when focus changes on the event scene

Author: beldenfox

modules/javafx.graphics/src/main/java/com/sun/javafx/scene/InputMethodStateManager.java

@@ -88,8 +88,7 @@ public InputMethodStateManager(Scene scene) {
     }
 
     /**
-     * Add a new Scene to the stack. It is assumed that Scenes form a stack
-     * and leave in LIFO order.
+     * Add a new Scene to the stack.
      */
     public void addScene(Scene scene) {
         if (scenes.contains(scene)) {
@@ -99,6 +98,9 @@ public void addScene(Scene scene) {
         updateInputMethodEventEnableState();
     }
 
+    /**
+     * Remove a Scene from the stack.
+     */
     public void removeScene(Scene scene) {
         if (scene != scenes.peekFirst()) {
             System.err.println("Popup scene removed out of order");
@@ -120,6 +122,18 @@ public void removeScene(Scene scene) {
         updateInputMethodEventEnableState();
     }
 
+    /**
+     * Every Scene must call this before the focusOwner changes.
+     */
+    public void focusOwnerWillChangeForScene(Scene scene) {
+        if (scene == currentEventScene) {
+            Scene root = rootScene.get();
+            if (root != null) {
+                SceneHelper.finishInputMethodComposition(root);
+            }
+        }
+    }
+
     /**
      * Every Scene must call this when the focusOwner changes.
      */

modules/javafx.graphics/src/main/java/javafx/scene/Scene.java

@@ -2329,13 +2329,7 @@ private void setFocusOwner(Node node, boolean focusVisible) {
         // This needs to be done before the focus owner is switched as it
         // generates event that needs to be delivered to the old focus owner.
         if (focusOwner.oldFocusOwner != null) {
-            final Scene s = getInputMethodStateManager().getRootScene();
-            if (s != null) {
-                final TKScene peer = s.getPeer();
-                if (peer != null) {
-                    peer.finishInputMethodComposition();
-                }
-            }
+            getInputMethodStateManager().focusOwnerWillChangeForScene(this);
         }
 
         // Store the current focusVisible state of the focus owner in case it needs to be