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/08/20 01:21:34 UTC
svn commit: r806008 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: PushButton.java
RadioButton.java skin/terra/TerraFileBrowserSkin.java
skin/terra/TerraTextInputSkin.java
Author: gbrown
Date: Wed Aug 19 23:21:34 2009
New Revision: 806008
URL: http://svn.apache.org/viewvc?rev=806008&view=rev
Log: (empty)
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java?rev=806008&r1=806007&r2=806008&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java Wed Aug 19 23:21:34 2009
@@ -49,14 +49,18 @@
if (isToggleButton()) {
State state = getState();
- if (state == State.SELECTED) {
- setState(State.UNSELECTED);
- }
- else if (state == State.UNSELECTED) {
- setState(isTriState() ? State.MIXED : State.SELECTED);
- }
- else {
- setState(State.SELECTED);
+ if (getGroup() == null) {
+ if (state == State.SELECTED) {
+ setState(State.UNSELECTED);
+ }
+ else if (state == State.UNSELECTED) {
+ setState(isTriState() ? State.MIXED : State.SELECTED);
+ }
+ else {
+ setState(State.SELECTED);
+ }
+ } else {
+ setSelected(true);
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java?rev=806008&r1=806007&r2=806008&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java Wed Aug 19 23:21:34 2009
@@ -51,7 +51,7 @@
}
public void press() {
- setSelected(getGroup() == null ? !isSelected() : true);
+ setSelected(true);
super.press();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=806008&r1=806007&r2=806008&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Wed Aug 19 23:21:34 2009
@@ -616,6 +616,13 @@
consumed = true;
}
}
+ } else if (keyCode == Keyboard.KeyCode.DELETE
+ || keyCode == Keyboard.KeyCode.BACKSPACE) {
+ Folder selectedFolder = fileBrowser.getSelectedFolder();
+ File parentDirectory = selectedFolder.getParentFile();
+ if (parentDirectory != null) {
+ fileBrowser.setSelectedFolder(new Folder(parentDirectory.getPath()));
+ }
}
return consumed;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=806008&r1=806007&r2=806008&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Wed Aug 19 23:21:34 2009
@@ -1072,7 +1072,7 @@
@Override
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
- boolean consumed = false;
+ boolean consumed = super.keyPressed(component, keyCode, keyLocation);
TextInput textInput = (TextInput)getComponent();
TextNode textNode = textInput.getTextNode();
@@ -1111,6 +1111,8 @@
} else {
textInput.delete(direction);
}
+
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.LEFT) {
int selectionStart = textInput.getSelectionStart();
int selectionLength = textInput.getSelectionLength();
@@ -1143,6 +1145,8 @@
}
textInput.setSelection(selectionStart, selectionLength);
+
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.RIGHT) {
int selectionStart = textInput.getSelectionStart();
int selectionLength = textInput.getSelectionLength();
@@ -1175,16 +1179,21 @@
}
textInput.setSelection(selectionStart, selectionLength);
+
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.HOME) {
// Move the caret to the beginning of the text
textInput.setSelection(0, 0);
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.END) {
// Move the caret to the end of the text
textInput.setSelection(textNode.getCharacterCount(), 0);
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.A
&& Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
// Select all
textInput.setSelection(0, textNode.getCharacterCount());
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.X
&& Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
if (textInput.isPassword()) {
@@ -1192,6 +1201,8 @@
} else {
textInput.cut();
}
+
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.C
&& Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
if (textInput.isPassword()) {
@@ -1199,9 +1210,12 @@
} else {
textInput.copy();
}
+
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.V
&& Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
textInput.paste();
+ consumed = true;
} else {
consumed = super.keyPressed(component, keyCode, keyLocation);
}