Revision: 17
http://swingme.svn.sourceforge.net/swingme/?rev=17&view=rev
Author: yuranet
Date: 2008-07-07 10:04:34 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
touch2
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Button.java
SwingME/src/net/yura/mobile/gui/components/CheckBox.java
SwingME/src/net/yura/mobile/gui/components/RadioButton.java
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-07 16:44:26 UTC (rev 16)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-07 17:04:34 UTC (rev 17)
@@ -31,21 +31,6 @@
private boolean useSelectButton;
- /**
- * Creates a new MButtonItem with the given label with requested button alignment.
- * @param label - the button label
- * @param font - preffered font object
- * @param align - One of the 3 available alignments(LEFT, HCENTER, RIGHT).
- */
-
- public boolean isSelected() {
- return selected;
- }
-
- public void setSelected(boolean selected) {
- this.selected = selected;
- }
-
public Button(){
this(null);
}
@@ -80,6 +65,14 @@
}
+ public boolean isSelected() {
+ return selected;
+ }
+
+ public void setSelected(boolean selected) {
+ this.selected = selected;
+ }
+
public void addActionListener(ActionListener l) {
al = l;
@@ -96,7 +89,17 @@
}
public boolean keyEvent(KeyEvent keyEvent) {
- return handelKeyEvent(keyEvent);
+
+ if (keyEvent.justPressedAction(Canvas.FIRE)) {
+
+ selected = true;
+
+ fireActionPerformed();
+
+ return true;
+ }
+ return false;
+
}
public void pointerEvent(int type, int x, int y) {
@@ -109,30 +112,17 @@
}
}
- public boolean handelKeyEvent(KeyEvent keypad) {
- if (keypad.justPressedAction(Canvas.FIRE)) {
-
- fireActionPerformed();
-
- return true;
- }
- return false;
- }
-
public void fireActionPerformed() {
+ if (buttonGroup!=null) {
+ // this unselects all other buttons in the same button group as this 1
+ buttonGroup.setSelected(this);
+ }
+
if (al!=null) {
al.actionPerformed((actionCommand!=null)?actionCommand:getText());
}
- if (buttonGroup!=null) {
- selected = true;
- buttonGroup.setSelected(this);
- }
- if (isSelected()==false){
- selected = true;
- }
-
-
+
}
public void setBorder(Border b) {
Modified: SwingME/src/net/yura/mobile/gui/components/CheckBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-07 16:44:26 UTC (rev 16)
+++ SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-07 17:04:34 UTC (rev 17)
@@ -3,10 +3,11 @@
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.Image;
-import net.yura.mobile.gui.KeyEvent;
public class CheckBox extends RadioButton {
+ private boolean oldState;
+
public CheckBox(String label,Image a,Image b) {
super(label,a,b);
}
@@ -15,18 +16,14 @@
super(label);
}
- public boolean keyEvent(KeyEvent keyEvent){
- boolean sel = selected;
- boolean consumed = handelKeyEvent(keyEvent);
- if (consumed && sel) {
+ public void fireActionPerformed() {
+
+ if (oldState) selected=false;
+
+ super.fireActionPerformed();
- selected = false;
-
- }
- if (consumed) {
- repaint();
- }
- return consumed;
+ oldState = selected;
+
}
Modified: SwingME/src/net/yura/mobile/gui/components/RadioButton.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-07 16:44:26 UTC (rev 16)
+++ SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-07 17:04:34 UTC (rev 17)
@@ -3,8 +3,6 @@
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.Image;
-import net.yura.mobile.gui.KeyEvent;
-
public class RadioButton extends Button {
protected Image selectedImage;
@@ -106,16 +104,12 @@
g.fillArc(x+size2, y+size2, size-(size2*2), size-(size2*2), 0, 360);
}
}
-
- public boolean keyEvent(KeyEvent keyEvent){
- boolean consumed = handelKeyEvent(keyEvent);
- if (consumed) {
- repaint();
- }
- return consumed;
- }
-
+ public void fireActionPerformed() {
+ repaint();
+ super.fireActionPerformed();
+ }
+
public Image getSelectedImage() {
return selectedImage;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|