You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/03/25 01:39:57 UTC
svn commit: r758106 - in /incubator/pivot/trunk: project/design/WTK.graffle
wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java
wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java
wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Author: gbrown
Date: Wed Mar 25 00:39:56 2009
New Revision: 758106
URL: http://svn.apache.org/viewvc?rev=758106&view=rev
Log:
Don't invoke editor unless component already had the focus.
Modified:
incubator/pivot/trunk/project/design/WTK.graffle
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/project/design/WTK.graffle
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/project/design/WTK.graffle?rev=758106&r1=758105&r2=758106&view=diff
==============================================================================
Binary files - no diff available.
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=758106&r1=758105&r2=758106&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 Wed Mar 25 00:39:56 2009
@@ -540,11 +540,6 @@
boolean consumed = super.mouseDown(component, button, x, y);
ListView listView = (ListView)getComponent();
-
- if (isFocusable()) {
- listView.requestFocus();
- }
-
List<Object> listData = (List<Object>)listView.getListData();
int itemHeight = getItemHeight();
@@ -589,7 +584,8 @@
}
} else {
if (selectMode != ListView.SelectMode.NONE) {
- if (listView.isItemSelected(itemIndex)) {
+ if (listView.isItemSelected(itemIndex)
+ && listView.isFocused()) {
// Edit the item
editIndex = itemIndex;
} else {
@@ -601,6 +597,8 @@
}
}
+ 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=758106&r1=758105&r2=758106&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 Wed Mar 25 00:39:56 2009
@@ -813,11 +813,6 @@
boolean consumed = super.mouseDown(component, button, x, y);
TableView tableView = (TableView)getComponent();
-
- if (isFocusable()) {
- tableView.requestFocus();
- }
-
int rowIndex = getRowAt(y);
if (rowIndex >= 0
@@ -853,7 +848,8 @@
}
} else {
if (selectMode != TableView.SelectMode.NONE) {
- if (tableView.isRowSelected(rowIndex)) {
+ if (tableView.isRowSelected(rowIndex)
+ && tableView.isFocused()) {
// Edit the row
editIndex = rowIndex;
} else {
@@ -864,6 +860,8 @@
}
}
+ 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=758106&r1=758105&r2=758106&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 Wed Mar 25 00:39:56 2009
@@ -1326,8 +1326,6 @@
if (!consumed) {
TreeView treeView = (TreeView)getComponent();
- treeView.requestFocus();
-
NodeInfo nodeInfo = getNodeInfoAt(y);
if (nodeInfo != null
@@ -1370,7 +1368,8 @@
TreeView.SelectMode selectMode = treeView.getSelectMode();
if (selectMode == TreeView.SelectMode.SINGLE) {
- if (nodeInfo.isSelected()) {
+ if (nodeInfo.isSelected()
+ && treeView.isFocused()) {
// Edit the node
editNode = nodeInfo;
} else {
@@ -1392,6 +1391,8 @@
}
}
}
+
+ treeView.requestFocus();
}
return consumed;