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 2011/05/18 22:53:03 UTC
svn commit: r1124425 - in
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra:
TerraListViewSkin.java TerraTableViewSkin.java TerraTreeViewSkin.java
Author: gbrown
Date: Wed May 18 20:53:03 2011
New Revision: 1124425
URL: http://svn.apache.org/viewvc?rev=1124425&view=rev
Log:
Revert changes for PIVOT-737 which broke range selection in ListView, TableView, and TreeView.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=1124425&r1=1124424&r2=1124425&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Wed May 18 20:53:03 2011
@@ -849,12 +849,12 @@ public class TerraListViewSkin extends C
|| !getCheckboxBounds(itemIndex).contains(x, y)) {
ListView.SelectMode selectMode = listView.getSelectMode();
- if (button == Mouse.Button.LEFT) {
+ if (button == Mouse.Button.RIGHT) {
if (selectMode != ListView.SelectMode.NONE
&& !listView.isItemSelected(itemIndex)) {
listView.setSelectedIndex(itemIndex);
}
-
+ } else {
Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=1124425&r1=1124424&r2=1124425&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Wed May 18 20:53:03 2011
@@ -1188,12 +1188,12 @@ public class TerraTableViewSkin extends
&& !tableView.isRowDisabled(rowIndex)) {
TableView.SelectMode selectMode = tableView.getSelectMode();
- if (button == Mouse.Button.LEFT) {
+ if (button == Mouse.Button.RIGHT) {
if (selectMode != TableView.SelectMode.NONE
&& !tableView.isRowSelected(rowIndex)) {
tableView.setSelectedIndex(rowIndex);
}
-
+ } else {
Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=1124425&r1=1124424&r2=1124425&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Wed May 18 20:53:03 2011
@@ -1630,12 +1630,12 @@ public class TerraTreeViewSkin extends C
if (!consumed) {
TreeView.SelectMode selectMode = treeView.getSelectMode();
- if (button == Mouse.Button.LEFT) {
+ if (button == Mouse.Button.RIGHT) {
if (!treeView.isNodeSelected(path)
&& selectMode != TreeView.SelectMode.NONE) {
treeView.setSelectedPath(path);
}
-
+ } else {
Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(commandModifier)