8331319: IME Window breaks after popup menu

Reviewed-by: kcr, angorya
openjdk · Apr 30, 2024 · cac81b5 · cac81b5 · openjdk-notifier · Apr 30, 2024
1 parent 7294849
commit cac81b5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m
@@ -742,7 +742,12 @@ - (void)finishInputMethodComposition
 {
     IMLOG("finishInputMethodComposition called");
     [self unmarkText];
-    [self.inputContext discardMarkedText];
+    // If we call discardMarkedText on an input context that is not
+    // the current one the IM will get into a persistent state where
+    // it will not call setMarkedText or firstRectForCharacterRange.
+    if (self.inputContext == NSTextInputContext.currentInputContext) {
+        [self.inputContext discardMarkedText];
+    }
 }
 
 /*