You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/04/10 00:35:22 UTC
svn commit: r763832 - in
/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra: TerraListViewSkin.java
TerraTableViewSkin.java TerraTreeViewSkin.java
Author: tvolkert
Date: Thu Apr 9 22:35:22 2009
New Revision: 763832
URL: http://svn.apache.org/viewvc?rev=763832&view=rev
Log:
Added check for focusability before trying to request focus for tree view, table view, list view
Modified:
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=763832&r1=763831&r2=763832&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java Thu Apr 9 22:35:22 2009
@@ -598,7 +598,9 @@
}
}
- listView.requestFocus();
+ if (listView.isFocusable()) {
+ listView.requestFocus();
+ }
return consumed;
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=763832&r1=763831&r2=763832&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java Thu Apr 9 22:35:22 2009
@@ -861,7 +861,9 @@
}
}
- tableView.requestFocus();
+ if (tableView.isFocusable()) {
+ tableView.requestFocus();
+ }
return consumed;
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=763832&r1=763831&r2=763832&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java Thu Apr 9 22:35:22 2009
@@ -1393,7 +1393,9 @@
}
}
- treeView.requestFocus();
+ if (treeView.isFocusable()) {
+ treeView.requestFocus();
+ }
}
return consumed;
@@ -1603,6 +1605,12 @@
return consumed;
}
+ @Override
+ public boolean isFocusable() {
+ TreeView treeView = (TreeView)getComponent();
+ return (treeView.getSelectMode() != TreeView.SelectMode.NONE);
+ }
+
// Component state events
@Override