You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by no...@apache.org on 2010/08/16 16:01:56 UTC
svn commit: r985933 - in
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra:
TerraListViewSkin.java TerraSpinnerSkin.java TerraTreeViewSkin.java
Author: noelgrandin
Date: Mon Aug 16 14:01:55 2010
New Revision: 985933
URL: http://svn.apache.org/viewvc?rev=985933&view=rev
Log:
PIVOT-287 Inconsistency between TableView, ListView, and TreeView as to when to consume arrow key events
Make all of the views consume UP and DOWN
Also fix multi-select using keyboard in 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/TerraSpinnerSkin.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=985933&r1=985932&r2=985933&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 Mon Aug 16 14:01:55 2010
@@ -971,48 +971,53 @@ public class TerraListViewSkin extends C
boolean consumed = super.keyPressed(component, keyCode, keyLocation);
ListView listView = (ListView)getComponent();
+ ListView.SelectMode selectMode = listView.getSelectMode();
switch (keyCode) {
case Keyboard.KeyCode.UP: {
- int index = listView.getFirstSelectedIndex();
-
- do {
- index--;
- } while (index >= 0
- && listView.isItemDisabled(index));
-
- if (index >= 0) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && listView.getSelectMode() == ListView.SelectMode.MULTI) {
- listView.addSelectedIndex(index);
- } else {
- listView.setSelectedIndex(index);
+ if (selectMode != ListView.SelectMode.NONE) {
+ int index = listView.getFirstSelectedIndex();
+
+ do {
+ index--;
+ } while (index >= 0
+ && listView.isItemDisabled(index));
+
+ if (index >= 0) {
+ if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
+ && listView.getSelectMode() == ListView.SelectMode.MULTI) {
+ listView.addSelectedIndex(index);
+ } else {
+ listView.setSelectedIndex(index);
+ }
}
+
+ consumed = true;
}
-
- consumed = true;
break;
}
case Keyboard.KeyCode.DOWN: {
- int index = listView.getLastSelectedIndex();
- int count = listView.getListData().getLength();
-
- do {
- index++;
- } while (index < count
- && listView.isItemDisabled(index));
-
- if (index < count) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && listView.getSelectMode() == ListView.SelectMode.MULTI) {
- listView.addSelectedIndex(index);
- } else {
- listView.setSelectedIndex(index);
+ if (selectMode != ListView.SelectMode.NONE) {
+ int index = listView.getLastSelectedIndex();
+ int count = listView.getListData().getLength();
+
+ do {
+ index++;
+ } while (index < count
+ && listView.isItemDisabled(index));
+
+ if (index < count) {
+ if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
+ && listView.getSelectMode() == ListView.SelectMode.MULTI) {
+ listView.addSelectedIndex(index);
+ } else {
+ listView.setSelectedIndex(index);
+ }
}
+
+ consumed = true;
}
-
- consumed = true;
break;
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java?rev=985933&r1=985932&r2=985933&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java Mon Aug 16 14:01:55 2010
@@ -350,15 +350,42 @@ public class TerraSpinnerSkin extends Co
protected class SpinButtonSkin extends ComponentSkin {
private boolean highlighted = false;
private boolean pressed = false;
+ private float minimumAspectRatio = 0.3f;
+ private static final int BUTTON_MARGIN_WIDTH = 3;
+ private static final int BUTTON_MARGIN_HEIGHT = 1;
@Override
public int getPreferredWidth(int height) {
- return BUTTON_IMAGE_SIZE + 6;
+ int preferredWidth = BUTTON_IMAGE_SIZE + (BUTTON_MARGIN_WIDTH * 2);
+
+ if (height == -1) {
+
+ } else {
+ // Adjust for preferred aspect ratio
+ if ((float) preferredWidth / (float) height < minimumAspectRatio) {
+ preferredWidth = (int) (height * minimumAspectRatio);
+ }
+ }
+
+ return preferredWidth;
}
@Override
public int getPreferredHeight(int width) {
- return BUTTON_IMAGE_SIZE + 2;
+ return BUTTON_IMAGE_SIZE + (BUTTON_MARGIN_HEIGHT * 1);
+ }
+
+ @Override
+ public Dimensions getPreferredSize() {
+ int preferredWidth = BUTTON_IMAGE_SIZE + (BUTTON_MARGIN_WIDTH * 2);
+ int preferredHeight = BUTTON_IMAGE_SIZE + (BUTTON_MARGIN_HEIGHT * 2);
+
+ // Adjust for preferred aspect ratio
+ if ((float) preferredWidth / (float) preferredHeight < minimumAspectRatio) {
+ preferredWidth = (int) (preferredHeight * minimumAspectRatio);
+ }
+
+ return new Dimensions(preferredWidth, preferredHeight);
}
@Override
@@ -381,8 +408,14 @@ public class TerraSpinnerSkin extends Co
// Paint the image
SpinButtonImage buttonImage = (SpinButtonImage)spinButton.getButtonImage();
- graphics.translate((width - BUTTON_IMAGE_SIZE) / 2,
- (height - BUTTON_IMAGE_SIZE) / 2);
+ // centre the image
+ graphics.translate(BUTTON_MARGIN_WIDTH, BUTTON_MARGIN_HEIGHT);
+ // scale the arrow to fit
+ float scaleX = (float)width / (float)BUTTON_IMAGE_SIZE;
+ float scaleY = (float)height / (float)BUTTON_IMAGE_SIZE;
+ if (scaleX > 1 && scaleY > 1) {
+ graphics.scale(scaleX, scaleY);
+ }
buttonImage.paint(graphics);
}
@@ -522,7 +555,7 @@ public class TerraSpinnerSkin extends Co
private static AutomaticSpinner automaticSpinner = new AutomaticSpinner();
- public static final int BUTTON_IMAGE_SIZE = 5;
+ private static final int BUTTON_IMAGE_SIZE = 5;
public TerraSpinnerSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
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=985933&r1=985932&r2=985933&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 Mon Aug 16 14:01:55 2010
@@ -1761,10 +1761,15 @@ public class TerraTreeViewSkin extends C
&& newSelectedNode.isDisabled());
if (newSelectedNode != null) {
- treeView.setSelectedPath(newSelectedNode.getPath());
+ if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
+ && treeView.getSelectMode() == TreeView.SelectMode.MULTI) {
+ treeView.addSelectedPath(newSelectedNode.getPath());
+ } else {
+ treeView.setSelectedPath(newSelectedNode.getPath());
+ }
treeView.scrollAreaToVisible(getNodeBounds(newSelectedNode));
- consumed = true;
}
+ consumed = true;
}
break;
@@ -1791,10 +1796,15 @@ public class TerraTreeViewSkin extends C
&& newSelectedNode.isDisabled());
if (newSelectedNode != null) {
- treeView.setSelectedPath(newSelectedNode.getPath());
+ if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
+ && treeView.getSelectMode() == TreeView.SelectMode.MULTI) {
+ treeView.addSelectedPath(newSelectedNode.getPath());
+ } else {
+ treeView.setSelectedPath(newSelectedNode.getPath());
+ }
treeView.scrollAreaToVisible(getNodeBounds(newSelectedNode));
- consumed = true;
}
+ consumed = true;
}
break;