|
From: <yu...@us...> - 2008-07-07 17:04:38
|
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.
|
|
From: <yu...@us...> - 2008-07-07 17:13:35
|
Revision: 18
http://swingme.svn.sourceforge.net/swingme/?rev=18&view=rev
Author: yuranet
Date: 2008-07-07 10:13: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/Component.java
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-07 17:04:34 UTC (rev 17)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-07 17:13:34 UTC (rev 18)
@@ -103,16 +103,17 @@
}
public void pointerEvent(int type, int x, int y) {
-
- if (type == DesktopPane.PRESSED) {
- selected=true;
- }
- else if (selected && type == DesktopPane.RELEASED) {
- fireActionPerformed();
- }
+ super.pointerEvent(type, x, y);
+
+ if (type == DesktopPane.PRESSED) {
+ selected=true;
+ }
+ else if (selected && type == DesktopPane.RELEASED) {
+ fireActionPerformed();
+ }
}
- public void fireActionPerformed() {
+ public void fireActionPerformed() {
if (buttonGroup!=null) {
// this unselects all other buttons in the same button group as this 1
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-07 17:04:34 UTC (rev 17)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-07 17:13:34 UTC (rev 18)
@@ -116,7 +116,11 @@
return false;
}
- public void pointerEvent(int type, int x, int y) { }
+ public void pointerEvent(int type, int x, int y) {
+ if (selectable && type == DesktopPane.PRESSED) {
+ DesktopPane.getDesktopPane().setFocusedComponent(this);
+ }
+ }
public void animate() { }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-09 14:56:52
|
Revision: 24
http://swingme.svn.sourceforge.net/swingme/?rev=24&view=rev
Author: yuranet
Date: 2008-07-09 07:56:51 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
better painting
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/Panel.java
SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-09 12:18:14 UTC (rev 23)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-09 14:56:51 UTC (rev 24)
@@ -146,15 +146,19 @@
public void focusGained() {
// default focusGained action, make me visible
- scrollRectToVisible(
+ makeVisible();
+
+ }
+
+ public void makeVisible() {
+ scrollRectToVisible(
(border!=null)?-border.getLeft():0,
(border!=null)?-border.getTop():0,
getWidthWithBorder(),
getHeightWithBorder(),
false);
+ }
- }
-
public void doLayout() { }
public void setBackground(int a) {
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-09 12:18:14 UTC (rev 23)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-09 14:56:51 UTC (rev 24)
@@ -98,7 +98,7 @@
public void remove(Component component) {
components.removeElement(component);
- //component.setOwner( null );
+ component.setOwnerAndParent(null,null);
constraints.remove(component);
}
@@ -126,31 +126,37 @@
public void paint(Graphics g) {
super.paint(g);
-
- //System.out.println("painting"+components);
-
+
paintChildren(g);
-
-
- //g.translate(-posX, -posY);
}
public void paintChildren(Graphics g){
- for(int i = 0; i < components.size(); i++){
- Component component = (Component)components.elementAt(i);
+
+ int clipX = g.getClipX();
+ int clipY = g.getClipY();
+ int clipWidth = g.getClipWidth();
+ int clipHeight = g.getClipHeight();
+
+ for(int i = 0; i < components.size(); i++){
+ Component component = (Component)components.elementAt(i);
- //if((doFullRepaint || repaintComponent == component) && focusComponent != component){
-
- int cx=component.getX();
- int cy=component.getY();
-
- g.translate(cx,cy );
-
- component.paint(g);
-
- g.translate(-cx, -cy);
- //}
- }
+ int rx = component.getXWithBorder();
+ int ry = component.getYWithBorder();
+
+ if (!(rx>clipX+clipWidth || ry >clipY+clipHeight || rx+component.getWidthWithBorder()<clipX || ry+component.getHeightWithBorder()<clipY)) {
+
+ int cx=component.getX();
+ int cy=component.getY();
+
+ g.translate(cx,cy );
+ component.paint(g);
+ g.translate(-cx, -cy);
+ }
+ //else {
+ // System.out.println("Wont paint "+component);
+ //}
+
+ }
}
// does nothing, but can be overridden
@@ -230,7 +236,9 @@
}
else if (newone instanceof Panel) {
- ((Panel)newone).breakOutAction(null,direction,scrolltothere);
+ ((Panel)newone).breakOutAction(null,direction,false);
+ // here we do NOT pass scrolltothere onto the child panel
+ // dont scroll if we go to a child, only scroll if we hit a parent
}
else if (newone!=component) {// this is just a check so it cant go into a infinite loop
@@ -287,44 +295,43 @@
public boolean repaintComponent(Graphics g, Component focusComponent) {
- for(int i = 0; i < components.size(); i++){
- Component component = (Component)components.elementAt(i);
+ for(int i = 0; i < components.size(); i++){
+ Component component = (Component)components.elementAt(i);
- int x=component.getX();
- int y=component.getY();
-
- if (component == focusComponent){
+ int x=component.getX();
+ int y=component.getY();
- g.translate(x,y);
- component.paint(g);
- g.translate(-x,-y);
-
- return true;
- }
- else if (component instanceof Panel){
-
- g.translate(x,y);
- boolean good = ((Panel)component).repaintComponent(g,focusComponent);
- g.translate(-x,-y);
-
- if (good) { return good; }
- }
- }
+ if (component == focusComponent){
+
+ g.translate(x,y);
+ component.paint(g);
+ g.translate(-x,-y);
+
+ return true;
+ }
+ else if (component instanceof Panel){
+
+ g.translate(x,y);
+ boolean good = ((Panel)component).repaintComponent(g,focusComponent);
+ g.translate(-x,-y);
+
+ if (good) { return good; }
+ }
+ }
return false;
}
public void removeAll() {
-
- // TODO not recursive
+
for(int i = 0; i < components.size(); i++){
- Component component = (Component)components.elementAt(i);
+ Component component = (Component)components.elementAt(i);
if (component.getOwner() == owner) {
component.setOwnerAndParent(null,null);
}
}
components.removeAllElements();
-
+ constraints.clear();
}
public void setName(String n) {
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-09 12:18:14 UTC (rev 23)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-09 14:56:51 UTC (rev 24)
@@ -120,34 +120,6 @@
a.setScrollPanel(null);
}
- //public void setOwner(MPanel owner){
- // super.setOwner(owner);
- //
- // component.setOwner(owner);
- //}
-
- public boolean makeVisible(Component newone,boolean smartscroll) {
-
- if (getComponent().getHeight() > getHeight() ||
- getComponent().getWidth() > getWidth()
- ) {
-
- return makeVisible(
- newone.getXWithBorder(),
- newone.getYWithBorder(),
- newone.getWidthWithBorder(),
- newone.getHeightWithBorder(),
- smartscroll
- );
- }
-
- // everything is ok and we dont have to scroll
- return true;
-
- }
-
-
-
public boolean makeVisible(int x,int y,int w,int h,boolean smartscroll) {
Component component = getComponent();
@@ -171,24 +143,31 @@
int viewHeight = getViewPortHeight();
int viewWidth = getViewPortWidth(viewHeight);
+ // check if the viewport is maybe already looks at part of this bigger area
+ // if it is, then we dont want to scroll to any part of it
+ if (!(x<=componentX+viewX && right>=componentX+viewX+viewWidth)) {
+ if (right > (viewX + componentX + viewWidth)){
+ componentX = right - viewWidth;
+ }
+
+ if (x < (viewX + componentX)){
+ componentX = x-viewX;
+ }
+ }
+
+ if (!(y<=componentY+viewY && bottom>=componentY+viewY+viewHeight)) {
+ if (bottom > (viewY + componentY + viewHeight)){
+ componentY = bottom - viewHeight;
+ }
+
+ if (y < (viewY + componentY)){
+ componentY = y-viewY;
+ }
+ }
+
+
- if (right > (viewX + componentX + viewWidth)){
- componentX = right - viewWidth;
- }
-
- if (bottom > (viewY + componentY + viewHeight)){
- componentY = bottom - viewHeight;
- }
-
- if (x < (viewX + componentX)){
- componentX = x-viewX;
- }
-
- if (y < (viewY + componentY)){
- componentY = y-viewY;
- }
-
// check we r not scrolling off the content panel
if ((viewX+componentX+viewWidth)>component.getWidth()) { componentX=component.getWidth()-viewWidth-viewX; }
if ((viewY+componentY+viewHeight)>component.getHeight()) { componentY=component.getHeight()-viewHeight-viewY; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-10 23:34:25
|
Revision: 27
http://swingme.svn.sourceforge.net/swingme/?rev=27&view=rev
Author: yuranet
Date: 2008-07-10 16:34:23 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
list 0 size fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/List.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-10 09:18:06 UTC (rev 26)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-10 23:34:23 UTC (rev 27)
@@ -107,7 +107,7 @@
// override and call super when things HAVE to be painted
public void paint(Graphics g) {
- System.out.println("paint "+this);
+ //System.out.println("paint "+this);
if (border != null) {
border.paintBorder(this, g,width,height);
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-10 09:18:06 UTC (rev 26)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-10 23:34:23 UTC (rev 27)
@@ -250,12 +250,14 @@
if (useSelectButton) {
DesktopPane.getDesktopPane().setComponentCommand(0, selectButton);
}
-
+
}
public boolean keyEvent(KeyEvent keypad) {
+ if (current==-1) { return false; }
+
int next = current+1;
int prev = current-1;
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-10 09:18:06 UTC (rev 26)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-10 23:34:23 UTC (rev 27)
@@ -126,7 +126,7 @@
public void setSize(int width, int height){
super.setSize(width, height);
- contentPane.setSize(width, height);
+ contentPane.setBoundsWithBorder(0,0,width, height);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
