changeset 5260:a217f67b7af6

RT-27177: [TreeTableView] ctrl+shift+up/down don't make scrolling.
author jgiles
date Thu, 03 Oct 2013 13:39:34 +1300
parents 006b0519158b
children 40bfec414944
files modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehaviorBase.java modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeViewBehavior.java
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java	Thu Oct 03 12:50:01 2013 +1300
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java	Thu Oct 03 13:39:34 2013 +1300
@@ -769,6 +769,8 @@
 
         sm.selectRange(newFocusIndex, startIndex + 1);
         fm.focus(newFocusIndex);
+
+        if (onFocusPreviousRow != null) onFocusPreviousRow.run();
     }
     
     private void discontinuousSelectNextRow() {
@@ -794,6 +796,8 @@
 
         sm.selectRange(startIndex, newFocusIndex + 1);
         fm.focus(newFocusIndex);
+
+        if (onFocusNextRow != null) onFocusNextRow.run();
     }
     
     private void discontinuousSelectPageUp() {
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehaviorBase.java	Thu Oct 03 12:50:01 2013 +1300
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehaviorBase.java	Thu Oct 03 13:39:34 2013 +1300
@@ -1119,6 +1119,8 @@
             }
             fm.focus(newFocusIndex, col);
         }
+
+        if (onFocusPreviousRow != null) onFocusPreviousRow.run();
     }
     
     protected void discontinuousSelectNextRow() {
@@ -1152,6 +1154,8 @@
             }
             fm.focus(newFocusIndex, col);
         }
+
+        if (onFocusNextRow != null) onFocusNextRow.run();
     }
     
     protected void discontinuousSelectPreviousColumn() {
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeViewBehavior.java	Thu Oct 03 12:50:01 2013 +1300
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeViewBehavior.java	Thu Oct 03 13:39:34 2013 +1300
@@ -761,7 +761,7 @@
         sm.selectRange(newFocusIndex, startIndex + 1);
         fm.focus(newFocusIndex);
 
-        onSelectPreviousRow.run();
+        if (onFocusPreviousRow != null) onFocusPreviousRow.run();
     }
     
     private void discontinuousSelectNextRow() {
@@ -788,7 +788,7 @@
         sm.selectRange(startIndex, newFocusIndex + 1);
         fm.focus(newFocusIndex);
 
-        onSelectNextRow.run();
+        if (onFocusNextRow != null) onFocusNextRow.run();
     }
     
     private void discontinuousSelectPageUp() {