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/09/11 17:50:03 UTC
svn commit: r813884 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: Accordion.java
TabPane.java skin/terra/TerraAccordionSkin.java
skin/terra/TerraTabPaneSkin.java
Author: tvolkert
Date: Fri Sep 11 15:50:03 2009
New Revision: 813884
URL: http://svn.apache.org/viewvc?rev=813884&view=rev
Log:
Made Accordion and TabPane respond to keyboard navigation events. Added index out of bounds checks on setSelectedIndex() in same classes
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java?rev=813884&r1=813883&r2=813884&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java Fri Sep 11 15:50:03 2009
@@ -227,6 +227,11 @@
}
public void setSelectedIndex(int selectedIndex) {
+ if (selectedIndex < -1
+ || selectedIndex > panels.getLength() - 1) {
+ throw new IndexOutOfBoundsException();
+ }
+
int previousSelectedIndex = this.selectedIndex;
if (previousSelectedIndex != selectedIndex) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java?rev=813884&r1=813883&r2=813884&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java Fri Sep 11 15:50:03 2009
@@ -241,6 +241,11 @@
}
public void setSelectedIndex(int selectedIndex) {
+ if (selectedIndex < -1
+ || selectedIndex > tabs.getLength() - 1) {
+ throw new IndexOutOfBoundsException();
+ }
+
int previousSelectedIndex = this.selectedIndex;
if (previousSelectedIndex != selectedIndex) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=813884&r1=813883&r2=813884&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Fri Sep 11 15:50:03 2009
@@ -36,6 +36,7 @@
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.Insets;
+import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Button.Group;
@@ -654,6 +655,106 @@
setButtonPadding(new Insets(buttonPadding));
}
+ @Override
+ public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+ boolean consumed = super.keyPressed(component, keyCode, keyLocation);
+
+ if (!consumed) {
+ Accordion accordion = (Accordion)getComponent();
+ Accordion.PanelSequence panels = accordion.getPanels();
+
+ if (Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
+ int selectedIndex = -1;
+
+ switch (keyCode) {
+ case Keyboard.KeyCode.N1: {
+ selectedIndex = 0;
+ break;
+ }
+
+ case Keyboard.KeyCode.N2: {
+ selectedIndex = 1;
+ break;
+ }
+
+ case Keyboard.KeyCode.N3: {
+ selectedIndex = 2;
+ break;
+ }
+
+ case Keyboard.KeyCode.N4: {
+ selectedIndex = 3;
+ break;
+ }
+
+ case Keyboard.KeyCode.N5: {
+ selectedIndex = 4;
+ break;
+ }
+
+ case Keyboard.KeyCode.N6: {
+ selectedIndex = 5;
+ break;
+ }
+
+ case Keyboard.KeyCode.N7: {
+ selectedIndex = 6;
+ break;
+ }
+
+ case Keyboard.KeyCode.N8: {
+ selectedIndex = 7;
+ break;
+ }
+
+ case Keyboard.KeyCode.N9: {
+ selectedIndex = 8;
+ break;
+ }
+ }
+
+ if (selectedIndex >= 0
+ && selectedIndex < panels.getLength()
+ && panels.get(selectedIndex).isEnabled()) {
+ accordion.setSelectedIndex(selectedIndex);
+ consumed = true;
+ }
+ } else if (Keyboard.isPressed(Keyboard.Modifier.ALT)) {
+ int n = panels.getLength();
+ int selectedIndex = accordion.getSelectedIndex();
+
+ switch (keyCode) {
+ case Keyboard.KeyCode.UP: {
+ do {
+ selectedIndex--;
+ } while (selectedIndex >= 0
+ && !panels.get(selectedIndex).isEnabled());
+
+ break;
+ }
+
+ case Keyboard.KeyCode.DOWN: {
+ do {
+ selectedIndex++;
+ } while (selectedIndex < n
+ && !panels.get(selectedIndex).isEnabled());
+
+ break;
+ }
+ }
+
+ if (selectedIndex >= 0
+ && selectedIndex < n
+ && panels.get(selectedIndex).isEnabled()) {
+ accordion.setSelectedIndex(selectedIndex);
+ consumed = true;
+ }
+ }
+ }
+
+ return consumed;
+ }
+
// Accordion events
@Override
public void panelInserted(Accordion accordion, int index) {
@@ -769,6 +870,9 @@
} else {
Button button = panelHeaders.get(selectedIndex);
button.setSelected(true);
+
+ Component selectedPanel = accordion.getPanels().get(selectedIndex);
+ selectedPanel.requestFocus();
}
invalidateComponent();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=813884&r1=813883&r2=813884&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Fri Sep 11 15:50:03 2009
@@ -33,6 +33,7 @@
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.Insets;
+import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Panorama;
@@ -1098,6 +1099,75 @@
this.collapsible = collapsible;
}
+ @Override
+ public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+ boolean consumed = super.keyPressed(component, keyCode, keyLocation);
+
+ if (!consumed
+ && Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
+ TabPane tabPane = (TabPane)getComponent();
+ TabPane.TabSequence tabs = tabPane.getTabs();
+
+ int selectedIndex = -1;
+
+ switch (keyCode) {
+ case Keyboard.KeyCode.N1: {
+ selectedIndex = 0;
+ break;
+ }
+
+ case Keyboard.KeyCode.N2: {
+ selectedIndex = 1;
+ break;
+ }
+
+ case Keyboard.KeyCode.N3: {
+ selectedIndex = 2;
+ break;
+ }
+
+ case Keyboard.KeyCode.N4: {
+ selectedIndex = 3;
+ break;
+ }
+
+ case Keyboard.KeyCode.N5: {
+ selectedIndex = 4;
+ break;
+ }
+
+ case Keyboard.KeyCode.N6: {
+ selectedIndex = 5;
+ break;
+ }
+
+ case Keyboard.KeyCode.N7: {
+ selectedIndex = 6;
+ break;
+ }
+
+ case Keyboard.KeyCode.N8: {
+ selectedIndex = 7;
+ break;
+ }
+
+ case Keyboard.KeyCode.N9: {
+ selectedIndex = 8;
+ break;
+ }
+ }
+
+ if (selectedIndex >= 0
+ && selectedIndex < tabs.getLength()
+ && tabs.get(selectedIndex).isEnabled()) {
+ tabPane.setSelectedIndex(selectedIndex);
+ consumed = true;
+ }
+ }
+
+ return consumed;
+ }
+
// Tab pane events
@Override
public void tabInserted(TabPane tabPane, int index) {
@@ -1233,6 +1303,7 @@
Component selectedTab = tabPane.getTabs().get(selectedIndex);
selectedTab.setVisible(true);
+ selectedTab.requestFocus();
}
if (previousSelectedIndex != -1) {