提交 f53ebf2f 编写于 作者: N naoto

6575419: Solaris : XSetICFoucs is not called with Java application at appropriate timing

Reviewed-by: okutsu
上级 e6fcd199
...@@ -96,6 +96,7 @@ public abstract class X11InputMethod extends InputMethodAdapter { ...@@ -96,6 +96,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
private Component awtFocussedComponent = null; private Component awtFocussedComponent = null;
private Component lastXICFocussedComponent = null; private Component lastXICFocussedComponent = null;
private boolean isLastXICActive = false; private boolean isLastXICActive = false;
private boolean isLastTemporary = false;
private boolean isActive = false; private boolean isActive = false;
private boolean isActiveClient = false; private boolean isActiveClient = false;
private static Map[] highlightStyles; private static Map[] highlightStyles;
...@@ -349,7 +350,7 @@ public abstract class X11InputMethod extends InputMethodAdapter { ...@@ -349,7 +350,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
current focussed component, change the XIC focus to the newly current focussed component, change the XIC focus to the newly
focussed component. focussed component.
*/ */
if (lastXICFocussedComponentPeer != awtFocussedComponentPeer || if (isLastTemporary || lastXICFocussedComponentPeer != awtFocussedComponentPeer ||
isLastXICActive != haveActiveClient()) { isLastXICActive != haveActiveClient()) {
if (lastXICFocussedComponentPeer != null) { if (lastXICFocussedComponentPeer != null) {
setXICFocus(lastXICFocussedComponentPeer, false, isLastXICActive); setXICFocus(lastXICFocussedComponentPeer, false, isLastXICActive);
...@@ -401,6 +402,7 @@ public abstract class X11InputMethod extends InputMethodAdapter { ...@@ -401,6 +402,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
*/ */
lastXICFocussedComponent = awtFocussedComponent; lastXICFocussedComponent = awtFocussedComponent;
isLastXICActive = isAc; isLastXICActive = isAc;
isLastTemporary = isTemporary;
isActive = false; isActive = false;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册