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 2010/01/17 22:42:04 UTC
svn commit: r900221 - in /pivot/trunk:
tests/src/org/apache/pivot/tests/SuggestionPopupTest.java
tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
Author: gbrown
Date: Sun Jan 17 21:42:04 2010
New Revision: 900221
URL: http://svn.apache.org/viewvc?rev=900221&view=rev
Log:
Make SuggestionPopupTest a more practical example.
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java?rev=900221&r1=900220&r2=900221&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java Sun Jan 17 21:42:04 2010
@@ -19,13 +19,11 @@
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
-import org.apache.pivot.wtk.Button;
-import org.apache.pivot.wtk.ButtonPressListener;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
-import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.SuggestionPopup;
import org.apache.pivot.wtk.TextInput;
+import org.apache.pivot.wtk.TextInputCharacterListener;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
@@ -34,7 +32,8 @@
private Window window = null;
@WTKX private TextInput textInput = null;
- @WTKX private PushButton showSuggestionsButton = null;
+
+ private SuggestionPopup suggestionPopup = new SuggestionPopup();
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
@@ -42,13 +41,18 @@
window = (Window)wtkxSerializer.readObject(this, "suggestion_popup_test.wtkx");
wtkxSerializer.bind(this);
- showSuggestionsButton.getButtonPressListeners().add(new ButtonPressListener() {
+ textInput.getTextInputCharacterListeners().add(new TextInputCharacterListener() {
@Override
- public void buttonPressed(Button button) {
+ public void charactersInserted(TextInput textInput, int index, int count) {
ArrayList<String> suggestions = new ArrayList<String>("One", "Two", "Three", "Four", "Five");
- SuggestionPopup suggestionPopup = new SuggestionPopup(suggestions);
+ suggestionPopup.setSuggestions(suggestions);
suggestionPopup.open(textInput);
}
+
+ @Override
+ public void charactersRemoved(TextInput textInput, int index, int count) {
+ suggestionPopup.close();
+ }
});
window.open(display);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx?rev=900221&r1=900220&r2=900221&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx Sun Jan 17 21:42:04 2010
@@ -22,7 +22,7 @@
<content>
<BoxPane orientation="vertical">
<TextInput wtkx:id="textInput"/>
- <PushButton wtkx:id="showSuggestionsButton" buttonData="Show Suggestions"/>
+ <TextInput/>
</BoxPane>
</content>
</Window>
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=900221&r1=900220&r2=900221&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Sun Jan 17 21:42:04 2010
@@ -82,14 +82,13 @@
SuggestionPopup suggestionPopup = (SuggestionPopup)getComponent();
if (keyCode == Keyboard.KeyCode.DOWN) {
- if (suggestionListView.getListData().getLength() > 0) {
- if (suggestionListView.getSelectedIndex() == -1) {
- suggestionListView.setSelectedIndex(0);
- }
-
- suggestionPopup.requestFocus();
- consumed = true;
+ if (suggestionListView.getSelectedIndex() == -1
+ && suggestionListView.getListData().getLength() > 0) {
+ suggestionListView.setSelectedIndex(0);
}
+
+ suggestionPopup.requestFocus();
+ consumed = true;
} else if (keyCode == Keyboard.KeyCode.ESCAPE) {
suggestionPopup.close();
consumed = true;
@@ -243,6 +242,8 @@
display.getContainerMouseListeners().remove(displayMouseListener);
SuggestionPopup suggestionPopup = (SuggestionPopup)getComponent();
+ suggestionPopup.clearFocusDescendant();
+
TextInput textInput = suggestionPopup.getTextInput();
textInput.getComponentKeyListeners().remove(textInputKeyListener);