OpenJDK / openjfx / 8u-dev / rt
changeset 5701:5faf1a0ea511 8.0-b116
Fix for RT-33256: Virtual keybord affects the ColorPicker popup window
| author | Elina Kleyman <elina.kleyman@oracle.com> |
|---|---|
| date | Tue, 12 Nov 2013 18:55:26 +0200 |
| parents | 7aaf7e527ece |
| children | 06e92c423984 026734a0cfa1 |
| files | modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java Tue Nov 12 19:51:02 2013 +0400 +++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java Tue Nov 12 18:55:26 2013 +0200 @@ -347,8 +347,6 @@ super(fxvk, new BehaviorBase<>(fxvk, Collections.EMPTY_LIST)); this.fxvk = fxvk; - StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/fxvk.css"); - fxvk.setFocusTraversable(false); if (fxvk != secondaryVK) {
--- a/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java Tue Nov 12 19:51:02 2013 +0400 +++ b/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java Tue Nov 12 18:55:26 2013 +0200 @@ -649,6 +649,10 @@ if (isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) { StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/two-level-focus.css"); } + + if (isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/fxvk.css"); + } return null; } }); @@ -674,6 +678,10 @@ if (isSupported(ConditionalFeature.TWO_LEVEL_FOCUS)) { StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/modena/two-level-focus.css"); } + + if (isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) { + StyleManager.getInstance().addUserAgentStylesheet("com/sun/javafx/scene/control/skin/caspian/fxvk.css"); + } return null; } });