changeset 6965:6bc3a6e9b4b8

RT-36929 [ToggleButton] focusTraversable can't be disabled
author Martin Sladecek <martin.sladecek@oracle.com>
date Fri, 02 May 2014 09:04:07 +0200
parents 225ce268fe32
children 2571b33a1ecf
files modules/graphics/src/main/java/com/sun/javafx/scene/traversal/ParentTraversalEngine.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/com/sun/javafx/scene/traversal/ParentTraversalEngine.java	Fri May 02 08:38:54 2014 +0200
+++ b/modules/graphics/src/main/java/com/sun/javafx/scene/traversal/ParentTraversalEngine.java	Fri May 02 09:04:07 2014 +0200
@@ -55,7 +55,9 @@
     }
 
     public boolean isParentTraversable() {
-        return overridenTraversability != null ? overridenTraversability : root.isFocusTraversable();
+        // This means the traversability can be overriden only for traversable root.
+        // If user explicitly disabled traversability, we don't set it back to true
+        return overridenTraversability != null ? root.isFocusTraversable() && overridenTraversability : root.isFocusTraversable();
     }
 
 }