You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(19) |
Nov
(19) |
Dec
(25) |
|
From: <yu...@us...> - 2008-07-17 12:11:06
|
Revision: 42
http://swingme.svn.sourceforge.net/swingme/?rev=42&view=rev
Author: yuranet
Date: 2008-07-17 12:10:33 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
tabbedpane fixed and draw contentpane paint fixed
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Panel.java
SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-17 10:39:26 UTC (rev 41)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-17 12:10:33 UTC (rev 42)
@@ -92,9 +92,7 @@
* @see java.awt.Container#add(java.awt.Component) Container.add
*/
public void add(Component component){
- components.addElement(component);
-
- component.setOwnerAndParent( owner,this );
+ addImpl(component);
}
/**
@@ -103,10 +101,18 @@
* @see java.awt.Container#add(java.awt.Component, java.lang.Object) Container.add
*/
public void add(Component component,int constraint){
- add(component);
-
+ addImpl(component);
constraints.put(component, new Integer(constraint));
}
+
+ /**
+ * @see java.awt.Container#addImpl(java.awt.Component, java.lang.Object, int) Container.addImpl
+ */
+ private void addImpl(Component component) {
+ components.addElement(component);
+ component.setOwnerAndParent( owner,this );
+ }
+
/**
* @param component The component to remove
* @see java.awt.Container#remove(java.awt.Component) Container.remove
Modified: SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-17 10:39:26 UTC (rev 41)
+++ SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-17 12:10:33 UTC (rev 42)
@@ -196,13 +196,13 @@
if (currentTabIndex==-1) {
if (tabPosition==Graphics.TOP || tabPosition==Graphics.LEFT) {
- add(scroll,tabPosition);
+ super.add(scroll,tabPosition);
}
super.add(thetabtoAdd);
if (tabPosition==Graphics.BOTTOM || tabPosition==Graphics.RIGHT) {
- add(scroll,tabPosition);
+ super.add(scroll,tabPosition);
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-17 10:39:26 UTC (rev 41)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-17 12:10:33 UTC (rev 42)
@@ -179,7 +179,7 @@
else if (a!=null) {
contentPane = a;
contentPane.setOwnerAndParent(this, null);
- contentPane.setBounds(0, 0, width, height);
+ contentPane.setBoundsWithBorder(0, 0, width, height);
//if (glasspanecomponent!=null) {
// setActiveComponent(contentPane);
@@ -269,8 +269,14 @@
public void paint(Graphics g) {
super.paint(g);
-
- contentPane.paint(g);
+
+ int x=contentPane.getX();
+ int y=contentPane.getY();
+
+ g.translate(x, y);
+ contentPane.paint(g);
+ g.translate(-x, -y);
+
drawGlass(g);
}
@@ -311,7 +317,7 @@
}
else {
- return contentPane.getComponentAt( x, y);
+ return contentPane.getComponentAt( x - contentPane.getX(), y - contentPane.getY());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-17 10:39:43
|
Revision: 41
http://swingme.svn.sourceforge.net/swingme/?rev=41&view=rev
Author: yuranet
Date: 2008-07-17 10:39:26 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
glass update
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/ComboBox.java
Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-17 10:38:08 UTC (rev 40)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-17 10:39:26 UTC (rev 41)
@@ -120,7 +120,7 @@
scroll.setLocation(getXInWindow(), y);
- owner.setGlassPaneComponent(scroll);
+ owner.setGlassPane(scroll);
pbuttons = new CommandButton[2];
pbuttons[0]=owner.getWindowCommands()[0];
@@ -199,7 +199,7 @@
setValue( list.getSelectedValue() );
- owner.setGlassPaneComponent(null);
+ owner.setGlassPane(null);
owner.setWindowCommand(0, pbuttons[0]);
owner.setWindowCommand(1, pbuttons[1]);
pbuttons=null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-17 10:38:20
|
Revision: 40
http://swingme.svn.sourceforge.net/swingme/?rev=40&view=rev
Author: yuranet
Date: 2008-07-17 10:38:08 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
javadoc
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/TabbedPane.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/test/MainPane.java
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-17 09:15:22 UTC (rev 39)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-17 10:38:08 UTC (rev 40)
@@ -168,6 +168,10 @@
public void workoutSize() { }
+ /**
+ * @param a The color of the background of the component (-1 for no color to be used)
+ * @see javax.swing.JComponent#setBackground(java.awt.Color) JComponent.setBackground
+ */
public void setBackground(int a) {
background = a;
@@ -187,6 +191,9 @@
return false;
}
+ /**
+ * @see java.awt.Component#repaint() Component.repaint
+ */
public void repaint() {
// if we are not in a window, do nothing
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-17 09:15:22 UTC (rev 39)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-17 10:38:08 UTC (rev 40)
@@ -35,7 +35,9 @@
private Vector components;
private Hashtable constraints;
-
+ /**
+ * @see javax.swing.JPanel#JPanel() JPanel.JPanel
+ */
public Panel() {
components = new Vector();
@@ -44,17 +46,21 @@
// this is true as u need to select a panel to get to 1 of its components
}
- public Panel(String n) {
- this();
- setName(n);
- }
-
+ /**
+ * @param n the LayoutManager to use
+ * @see javax.swing.JPanel#JPanel(java.awt.LayoutManager) JPanel.JPanel
+ */
public Panel(Layout n) {
this();
setLayout(n);
}
-
+
+ public Panel(String n) {
+ this();
+ setName(n);
+ }
+
/**
* @param lt the specified layout manager
* @see java.awt.Container#setLayout(java.awt.LayoutManager) Container.setLayout
@@ -91,13 +97,20 @@
component.setOwnerAndParent( owner,this );
}
-
+ /**
+ * @param component
+ * @param constraint
+ * @see java.awt.Container#add(java.awt.Component, java.lang.Object) Container.add
+ */
public void add(Component component,int constraint){
add(component);
constraints.put(component, new Integer(constraint));
}
-
+ /**
+ * @param component The component to remove
+ * @see java.awt.Container#remove(java.awt.Component) Container.remove
+ */
public void remove(Component component) {
components.removeElement(component);
@@ -105,34 +118,56 @@
constraints.remove(component);
}
-
+ /**
+ * @param c The index of the component to remove
+ * @see java.awt.Container#remove(int) Container.remove
+ */
public void remove(int c) {
Component component = (Component)components.elementAt(c);
remove(component);
}
+
+ /**
+ * @see java.awt.Container#add(java.awt.Component, int) Container.add
+ */
public void insert(Component component,int index) {
components.insertElementAt(component, index);
component.setOwnerAndParent( owner,this );
}
- public void insert(Component component,int index,String constraint) {
+ /**
+ * @see java.awt.Container#add(java.awt.Component, java.lang.Object, int) Container.add
+ */
+ public void insert(Component component,int constraint,int index) {
insert(component, index);
- constraints.put(component, constraint);
+ constraints.put(component, new Integer(constraint) );
}
+ /**
+ * @return the number of components in this panel
+ * @see java.awt.Container#getComponentCount() Container.getComponentCount
+ */
public int getComponentCount() {
return components.size();
}
+ /**
+ * @param g Graphics object
+ * @see java.awt.Container#paint(java.awt.Graphics) Container.paint
+ */
public void paint(Graphics g) {
super.paint(g);
paintChildren(g);
}
+ /**
+ * @param g Graphics object
+ * @see java.awt.Container#paintComponents(java.awt.Graphics) Container.paintComponents
+ */
public void paintChildren(Graphics g){
int clipX = g.getClipX();
@@ -232,6 +267,7 @@
/**
* this means reclac the size of children
* and then redo the layout
+ * @see javax.swing.JComponent#revalidate() JComponent.revalidate
*/
public void revalidate() {
@@ -335,10 +371,17 @@
}
+ /**
+ * @return an array of all the components in this container
+ * @see java.awt.Container#getComponents() Container.getComponents
+ */
public Vector getComponents() {
return components;
}
+ /**
+ * @see java.awt.Container#removeAll() Container.removeAll
+ */
public void removeAll() {
for(int i = 0; i < components.size(); i++){
@@ -352,10 +395,20 @@
constraints.clear();
}
+ /**
+ * @param n The new name for this panel
+ * @see java.awt.Component#setName(java.lang.String) Component.setName
+ * @see TabbedPane#add(net.yura.mobile.gui.components.Component)
+ */
public void setName(String n) {
name = n;
}
+ /**
+ * @return The name of the panel
+ * @see java.awt.Component#getName() Component.getName
+ * @see TabbedPane#add(net.yura.mobile.gui.components.Component)
+ */
public String getName() {
return name;
}
@@ -372,6 +425,12 @@
}
}
+ /**
+ * @param x the x coordinate
+ * @param y the y coordinate
+ * @return the top-most child is returned
+ * @see java.awt.Container#getComponentAt(int, int) Container.getComponentAt
+ */
public Component getComponentAt(int x, int y) {
for(int i = 0; i < components.size(); i++){
Component component = (Component)components.elementAt(i);
Modified: SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-17 09:15:22 UTC (rev 39)
+++ SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-17 10:38:08 UTC (rev 40)
@@ -80,13 +80,18 @@
* @param p the Panel to add
* @see javax.swing.JTabbedPane#add(java.awt.Component) JTabbedPane.add
*/
- public void addTab(Panel p) {
- addTab(p.getName(),p);
+ public void add(Component p) {
+ if (p instanceof Panel) {
+ addTab(((Panel)p).getName(),p);
+ }
+ else {
+ addTab(p.toString(), p);
+ }
}
/**
- * @param title
- * @param component
+ * @param title The title for the tab
+ * @param component The component of the tab
* @see javax.swing.JTabbedPane#addTab(java.lang.String, java.awt.Component) JTabbedPane.addTab
*/
public void addTab(String title, Component component) {
@@ -94,9 +99,9 @@
}
/**
- * @param title
- * @param icon
- * @param component
+ * @param title The title for the tab
+ * @param icon The icon for the tab
+ * @param component The component of the tab
* @see javax.swing.JTabbedPane#addTab(java.lang.String, javax.swing.Icon, java.awt.Component) JTabbedPane.addTab
*/
public void addTab(String title, Image icon, Component component) {
@@ -160,8 +165,8 @@
}
/**
- * @param index
- * @return
+ * @param index the index of the tab to get
+ * @return gets the component on the tab with index a
* @see javax.swing.JTabbedPane#getComponentAt(int) JTabbedPane.getComponentAt
*/
public Panel getComponentAt(int index) {
@@ -194,7 +199,7 @@
add(scroll,tabPosition);
}
- add(thetabtoAdd);
+ super.add(thetabtoAdd);
if (tabPosition==Graphics.BOTTOM || tabPosition==Graphics.RIGHT) {
add(scroll,tabPosition);
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-17 09:15:22 UTC (rev 39)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-17 10:38:08 UTC (rev 40)
@@ -46,6 +46,9 @@
this.actionListener = actionListener;
}
+ /**
+ * @see javax.swing.JFrame#JFrame() JFrame.JFrame
+ */
public Window() {
this(null);
}
@@ -91,6 +94,7 @@
* sets the new size and revaliates the window
* @param width new Width
* @param height new Height
+ * @see java.awt.Component#setSize(int, int) Component.setSize
*/
public void setSize(int width, int height) {
super.setSize(width, height);
@@ -108,8 +112,29 @@
}
+ /**
+ * @param b true if the window is to be shown, flase to hide the window
+ * @see java.awt.Component#setVisible(boolean) Component.setVisible
+ */
+ public void setVisible(boolean b) {
+
+ if (b) {
+ DesktopPane.getDesktopPane().add(this);
+ }
+ else {
+ DesktopPane.getDesktopPane().remove(this);
+ }
+ }
+
+
private Component old;
- public void setGlassPaneComponent(Panel c) {
+
+
+ /**
+ * @param c The new Glass Pane
+ * @see javax.swing.JFrame#setGlassPane(java.awt.Component) JFrame.setGlassPane
+ */
+ public void setGlassPane(Panel c) {
if (glasspanecomponent == c) {
@@ -140,6 +165,10 @@
}
+ /**
+ * @param a The new content pane
+ * @see javax.swing.JFrame#setContentPane(java.awt.Container) JFrame.setContentPane
+ */
public void setContentPane(Panel a) {
if (contentPane == a) {
@@ -167,12 +196,19 @@
}
- public Panel getGlassPaneComponent() {
-
- return glasspanecomponent;
- }
+ /**
+ * @return The current glass pane, null if none is set
+ * @see javax.swing.JFrame#getGlassPane() JFrame.getGlassPane
+ */
+ public Panel getGlassPane() {
+
+ return glasspanecomponent;
+ }
-
+ /**
+ * @return The current content pane
+ * @see javax.swing.JFrame#getContentPane() JFrame.getContentPane
+ */
public Panel getContentPane() {
return contentPane;
@@ -183,7 +219,7 @@
* This method needs to paint a component IF repaintComponent!=null
* otherwise it needs to repaint the window
*
- * This method can NOT get called if repaintComponent.transparent
+ * This method can NOT get called if repaintComponent.isOpaque() == flase
*
* @return true if it was successful and false otherwise
*/
@@ -260,6 +296,12 @@
// if we drag next to the border
}
+ /**
+ * @param x the x coordinate
+ * @param y the y coordinate
+ * @return the top-most child is returned
+ * @see java.awt.Container#getComponentAt(int, int) Container.getComponentAt
+ */
public Component getComponentAt(int x, int y) {
@@ -299,9 +341,11 @@
return super.toString() +" "+ contentPane +" "+glasspanecomponent;
}
-
+
public void repaint() {
+
+ // TODO what if we have a parent here?!
if (this == DesktopPane.getDesktopPane().getSelectedFrame() && isOpaque()) {
DesktopPane.getDesktopPane().windowRepaint();
}
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-17 09:15:22 UTC (rev 39)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-17 10:38:08 UTC (rev 40)
@@ -358,7 +358,7 @@
TabbedPane tabbedPane = new TabbedPane();
- tabbedPane.addTab(tab1);
+ tabbedPane.add(tab1);
tabbedPane.addTab("TAB 2", image, tab2);
tabbedPane.addTab("tab 3 a long one eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", new ScrollPane(tab3));
tabbedPane.addTab(null,image,tab4);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-17 09:15:30
|
Revision: 39
http://swingme.svn.sourceforge.net/swingme/?rev=39&view=rev
Author: yuranet
Date: 2008-07-17 09:15:22 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
bugs fixed
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/components/ComboBox.java
SwingME/src/net/yura/mobile/gui/components/List.java
SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
SwingME/src/net/yura/mobile/gui/components/TextField.java
SwingME/src/net/yura/mobile/gui/components/TitleBar.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-15 21:03:11 UTC (rev 38)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-17 09:15:22 UTC (rev 39)
@@ -841,6 +841,8 @@
if (!paintdone) return;
+ boolean old = sideSoftKeys;
+
if (w>h) {
sideSoftKeys = true;
}
@@ -848,16 +850,20 @@
sideSoftKeys = false;
}
- for (int c=0;c<windows.size();c++) {
- Window window = (Window)windows.elementAt(c);
-
- // TODO RESIZE better
- //if (window.getX()==0 && window.getY()==0) {
- window.setBounds(window.getY(),window.getX(),window.getHeight(), window.getWidth());
- //}
+ if (old!=sideSoftKeys) {
+
+ for (int c=0;c<windows.size();c++) {
+ Window window = (Window)windows.elementAt(c);
+
+ // TODO RESIZE better
+ //if (window.getX()==0 && window.getY()==0) {
+ window.setBounds(window.getY(),window.getX(),window.getHeight(), window.getWidth());
+ //}
+ }
+ fullRepaint();
}
- fullRepaint();
+
}
Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-15 21:03:11 UTC (rev 38)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-17 09:15:22 UTC (rev 39)
@@ -22,6 +22,7 @@
import javax.microedition.lcdui.Image;
import net.yura.mobile.gui.ActionListener;
import net.yura.mobile.gui.CommandButton;
+import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.cellrenderer.DefaultListCellRenderer;
import net.yura.mobile.util.Option;
@@ -33,17 +34,22 @@
private Image selectedImage;
private Image nonSelectedImage;
-
-// private Vector items;
+
private List list;
private ScrollPane scroll;
private CommandButton[] pbuttons;
+ /**
+ * @see javax.swing.JComboBox#JComboBox() JComboBox.JComboBox
+ */
public ComboBox() {
}
-
+ /**
+ * @param vec an vector of objects to insert into the combo box
+ * @see javax.swing.JComboBox#JComboBox(java.util.Vector) JComboBox.JComboBox
+ */
public ComboBox(Vector vec){
this();
@@ -77,32 +83,43 @@
}
- width = count + padding*2 + ((nonSelectedImage == null)?hi:nonSelectedImage.getWidth());
+ width = count + padding*2 + ((nonSelectedImage == null)?getFont().getHeight():nonSelectedImage.getWidth());
height = hi + padding*2;
}
- int h = height * getItems().size();
- if(h > height * 4){
- h = height *4;
- }
- scroll.setSize(width, h);
- scroll.revalidate();
+
}
+ else {
+ // in case we are empty then use the normal size
+ super.workoutSize();
+ }
}
public void fireActionPerformed() {
createList();
-
+ list.workoutSize();
+
+ int h = list.getHeightWithBorder();
+ if(h > DesktopPane.getDesktopPane().getHeight()/2){
+ h = DesktopPane.getDesktopPane().getHeight()/2;
+ }
+ scroll.setSize(width, h);
+ scroll.revalidate();
+
+
+
int y;
if ((getYInWindow() + height + scroll.getHeight()) > owner.getHeight()){
y = getYInWindow() - scroll.getHeight();
- } else{
+ }
+ else {
y = getYInWindow() + height;
}
+
- scroll.setLocation(getXInWindow(), y);
+ scroll.setLocation(getXInWindow(), y);
owner.setGlassPaneComponent(scroll);
pbuttons = new CommandButton[2];
@@ -121,9 +138,7 @@
list.setBackground(background);
list.addActionListener(this);
scroll = new ScrollPane(list);
- // TODO setbackground?? scroll.setTransparent(false);
scroll.setBorder(activeBorder);
-
}
}
@@ -182,7 +197,7 @@
public void actionPerformed(String actionCommand) {
- setValue( list.getFocusedItem() );
+ setValue( list.getSelectedValue() );
owner.setGlassPaneComponent(null);
owner.setWindowCommand(0, pbuttons[0]);
@@ -196,13 +211,13 @@
public Object getSelected() {
createList();
- return list.getFocusedItem();
+ return list.getSelectedValue();
}
public void setSelected(Object selected) {
createList();
- list.setFocusedItem(selected);
- super.setText(selected.toString());
+ list.setSelectedValue(selected);
+ super.setValue(selected);
}
@@ -212,7 +227,7 @@
public int getFocusedItemIndex(){
- return list.getFocusedItemIndex();
+ return list.getSelectedIndex();
}
/**
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-15 21:03:11 UTC (rev 38)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-17 09:15:22 UTC (rev 39)
@@ -35,100 +35,126 @@
*/
public class List extends Component implements ActionListener {
- private static CommandButton selectButton = new CommandButton("Select","select");
-
- public static void setSelectButtonText(String a) {
-
- selectButton = new CommandButton(a,selectButton.getActionCommand());
-
- }
- private boolean useSelectButton;
-
- private Vector items;
- private ListCellRenderer renderer;
- private int current;
+ private static CommandButton selectButton = new CommandButton("Select","select");
- private ActionListener al;
+ public static void setSelectButtonText(String a) {
+
+ selectButton = new CommandButton(a,selectButton.getActionCommand());
+
+ }
+ private boolean useSelectButton;
+
+ private Vector items;
+ private ListCellRenderer renderer;
+ private int current;
+
+ private ActionListener al;
private ChangeListener chl;
- private String actionCommand;
-
- private boolean loop;
+ private String actionCommand;
+
+ private boolean loop;
private boolean horizontal;
-
- public void addActionListener(ActionListener l) {
-
- al = l;
-
- }
- public void removeActionListener(ActionListener l) {
-
- if (al == l) { al = null; }
- }
-
- public void setActionCommand(String ac) {
-
- actionCommand=ac;
- }
-
- public List(ListCellRenderer a) {
- this(null,a,false);
- }
-
- public void setLoop(boolean l) {
- loop = l;
+ public List(ListCellRenderer a) {
+ this(null,a,false);
+ }
+
+ // real constructor!
+ public List(Vector a,ListCellRenderer b,boolean h) {
+ items = a;
+ if (items==null) {
+ items = new Vector();
}
-
- // real constructor!
- public List(Vector a,ListCellRenderer b,boolean h) {
- items = a;
- if (items==null) {
- items = new Vector();
- }
- setCellRenderer(b);
+ setCellRenderer(b);
horizontal = h;
- setFocusedItemIndex(-1);
-
+ setSelectedIndex(-1);
+
background = DesktopPane.getDefaultTheme().background;
- }
-
- public void setCellRenderer(ListCellRenderer cellRenderer) {
-
- renderer = cellRenderer;
- //workoutItemSize();
- }
-
- public void setListData(Vector a) {
-
- items = a;
- if (a == null || current >= a.size()){
- setFocusedItemIndex(-1);
- }
+ }
- }
-
- public void addListItem(Object a) {
-
- items.addElement(a);
- //workoutItemSize();
- }
-
-
+ public void addActionListener(ActionListener l) {
+
+ al = l;
+
+ }
+ public void removeActionListener(ActionListener l) {
+
+ if (al == l) { al = null; }
+ }
+
+ public void setActionCommand(String ac) {
+
+ actionCommand=ac;
+ }
+
+ public void setLoop(boolean l) {
+ loop = l;
+ }
+
+ /**
+ * @param cellRenderer
+ * @see javax.swing.JList#setCellRenderer(javax.swing.ListCellRenderer) JList.setCellRenderer
+ */
+ public void setCellRenderer(ListCellRenderer cellRenderer) {
+
+ renderer = cellRenderer;
+ //workoutItemSize();
+ }
+ /**
+ * @param a
+ * @see javax.swing.JList#setListData(java.util.Vector) JList.setListData
+ */
+ public void setListData(Vector a) {
+
+ items = a;
+ if (a == null || current >= a.size()){
+ setSelectedIndex(-1);
+ }
+
+ }
+
+ /**
+ * @param a
+ * @see javax.swing.DefaultListModel#addElement(java.lang.Object) DefaultListModel.addElement
+ */
+ public void addElement(Object a) {
+
+ items.addElement(a);
+
+ }
+
+ /**
+ * @param i
+ * @see javax.swing.DefaultListModel#removeElementAt(int) DefaultListModel#removeElementAt
+ */
+ public void removeElementAt(int i) {
+
+ items.removeElementAt(i);
+ if (current == i) {
+ current = -1;
+ }
+ else if (current > i) {
+ current--;
+ }
+
+ }
+
+
public void paintComponent(Graphics g) {
-
+
int offset=0;
boolean good=false;
for(int i = 0; i < items.size(); i++){
- Component c = getComponentFor(i,offset);
-
+ Component c = getComponentFor(i,offset);
+
offset = offset + ((horizontal)?c.getWidthWithBorder():c.getHeightWithBorder());
- //g.setColor(0x0000FF00);
- //g.drawRect(c.getX(), c.getY(), c.getWidth(), c.getHeight());
-
+ //g.setColor(0x0000FF00);
+ //g.drawRect(c.getX(), c.getY(), c.getWidth(), c.getHeight());
+
int x = c.getXWithBorder();
int y = c.getYWithBorder();
-
+
if (x < g.getClipX()+g.getClipWidth() &&
x + c.getWidthWithBorder() > g.getClipX() &&
y < g.getClipY()+g.getClipHeight() &&
@@ -148,58 +174,58 @@
}
}
-
+
}
public void addChangeListener(ChangeListener aThis) {
chl = aThis;
}
-
+
private Component getComponentFor(int a) {
-
+
int offset=0;
-
+
for(int i = 0; true; i++){
- Component c = getComponentFor(i,offset);
-
+ Component c = getComponentFor(i,offset);
+
if (i==a) {
return c;
}
-
+
offset = offset + ((horizontal)?c.getWidthWithBorder():c.getHeightWithBorder());
- }
+ }
}
-
+
private Component getComponentFor(int i,int offset) {
-
- Object item = items.elementAt(i);
- Component c = renderer.getListCellRendererComponent(this, item, i, i == current, isFocused() && i == current);
-
- c.setBoundsWithBorder(
+ Object item = items.elementAt(i);
+
+ Component c = renderer.getListCellRendererComponent(this, item, i, i == current, isFocused() && i == current);
+
+ c.setBoundsWithBorder(
((horizontal)?offset:0),
((horizontal)?0:offset),
((horizontal)?c.getWidthWithBorder():width),
((horizontal)?height:c.getHeightWithBorder())
);
- return c;
-
+ return c;
+
}
-
+
//public void setSize(int width, int height){
// super.setSize(width, height);
// workoutItemSize();
//}
-
- public void workoutSize() {
-
- if (items!=null) {
-
- Component c=null;
- int totalHeight = 0;
- int totalWidth = 0;
-
+
+ public void workoutSize() {
+
+ if (items!=null) {
+
+ Component c=null;
+ int totalHeight = 0;
+ int totalWidth = 0;
+
for(int i = 0; i < items.size(); i++){
Object item = (Object)items.elementAt(i);
c = renderer.getListCellRendererComponent(this, item, i, false, i == current);
@@ -211,7 +237,7 @@
else {
totalHeight = totalHeight + c.getHeightWithBorder();
}
-
+
if (horizontal) {
totalWidth = totalWidth + c.getWidthWithBorder();
}
@@ -228,51 +254,51 @@
else {
setSize((totalWidth<width)?width:totalWidth,totalHeight);
}
- }
- }
-
- public void focusLost() {
- super.focusLost();
- if (useSelectButton) {
- DesktopPane.getDesktopPane().setComponentCommand(0, null);
- }
+ }
+ }
+
+ public void focusLost() {
+ super.focusLost();
+ if (useSelectButton) {
+ DesktopPane.getDesktopPane().setComponentCommand(0, null);
+ }
repaint();
- }
-
+ }
+
public void focusGained() {
super.focusGained();
if (items.size() != 0 ) {
if (current==-1) { current=0; }
- setFocusedItemIndex(current);
+ setSelectedIndex(current);
}
if (useSelectButton) {
DesktopPane.getDesktopPane().setComponentCommand(0, selectButton);
}
-
+
}
-
- public boolean keyEvent(KeyEvent keypad) {
-
+
+ public boolean keyEvent(KeyEvent keypad) {
+
if (current==-1) { return false; }
-
- int next = current+1;
- int prev = current-1;
- if (loop) {
- if (next>=items.size()) { next = (items.size()==0)?-1:0; }
- if (prev<0) { prev = items.size()-1; }
- }
- else {
- if (next>=items.size()) { next=-1; }
- }
-
+ int next = current+1;
+ int prev = current-1;
+
+ if (loop) {
+ if (next>=items.size()) { next = (items.size()==0)?-1:0; }
+ if (prev<0) { prev = items.size()-1; }
+ }
+ else {
+ if (next>=items.size()) { next=-1; }
+ }
+
if (keypad.isDownAction(Canvas.DOWN)) {
if (!horizontal && next!=-1) {
- setFocusedItemIndex(next);
+ setSelectedIndex(next);
return true;
}
//else {
@@ -284,7 +310,7 @@
return true;
}
}
-
+
return false;
//}
@@ -292,7 +318,7 @@
else if (keypad.isDownAction(Canvas.UP)) {
if (!horizontal && prev!=-1) {
- setFocusedItemIndex(prev);
+ setSelectedIndex(prev);
return true;
}
//else {
@@ -311,7 +337,7 @@
else if (keypad.isDownAction(Canvas.RIGHT)) {
if (horizontal && next!=-1) {
- setFocusedItemIndex(next);
+ setSelectedIndex(next);
return true;
}
//else {
@@ -325,7 +351,7 @@
return true;
}
}
-
+
return false;
//}
@@ -333,7 +359,7 @@
else if (keypad.isDownAction(Canvas.LEFT)) {
if (horizontal && prev!=-1) {
- setFocusedItemIndex(prev);
+ setSelectedIndex(prev);
return true;
}
//else {
@@ -361,42 +387,59 @@
}
- }
+ }
- public boolean fireActionPerformed() {
-
- if (al!=null) {
- al.actionPerformed(actionCommand);
- return true;
- }
- return false;
-
- }
-
- public Object getFocusedItem() {
-
- return items.elementAt(current);
- }
-
- public int getFocusedItemIndex(){
- return current;
- }
-
- public void setFocusedItem(Object a) {
-
- setFocusedItemIndex( items.indexOf(a) );
- }
-
- public void setFocusedItemIndex(int a) {
-
- current = a;
- if (current!=-1) {
-
+ public boolean fireActionPerformed() {
+
+ if (al!=null) {
+ al.actionPerformed(actionCommand);
+ return true;
+ }
+ return false;
+
+ }
+
+ /**
+ * @return the first selected value, or null if the selection is empty
+ * @see javax.swing.JList#getSelectedValue() JList.getSelectedValue
+ */
+ public Object getSelectedValue() {
+
+ if (current==-1) return null;
+ return items.elementAt(current);
+ }
+
+ /**
+ * @return the first selected index; returns -1 if there is no selected item
+ * @see javax.swing.JList#getSelectedIndex() JList.getSelectedIndex
+ */
+ public int getSelectedIndex(){
+ return current;
+ }
+
+ /**
+ * @param a the object to select
+ * @see javax.swing.JList#setSelectedValue(java.lang.Object, boolean) JList.setSelectedValue
+ */
+ public void setSelectedValue(Object a) {
+
+ setSelectedIndex( items.indexOf(a) );
+ }
+
+ /**
+ * @param a the index of the one cell to select
+ * @see javax.swing.JList#setSelectedIndex(int) JList.setSelectedIndex
+ */
+ public void setSelectedIndex(int a) {
+
+ current = a;
+ if (current!=-1) {
+
Component c = getComponentFor(a);
// good, but too simple
// what if we are scrolled right already?
//scrollTo(c);
-
+
// THIS WILL NOT WORK if list in inside a panel inside a scrollpane
// as posX and posY will be wrong!
// ALSO WILLNOT WORK IN BOXLAYOUT HCENTRE IF NOT THE FIRST COMPONENT
@@ -406,8 +449,8 @@
else {
scrollRectToVisible( -posX, c.getYWithBorder(), 1, c.getHeightWithBorder(),false);
}
-
-
+
+
if (chl!=null) {
chl.changeEvent(a);
}
@@ -415,31 +458,31 @@
// we dont need it here
// BUT what if we are not in a scrollPane??
repaint();
- }
- }
-
-
- public Vector getItems() {
- return items;
- }
-
- public void actionPerformed(String actionCommand) {
-
- if(selectButton.getActionCommand().equals(actionCommand)) {
-
- fireActionPerformed();
- }
-
- }
-
- public boolean isUseSelectButton() {
- return useSelectButton;
- }
+ }
+ }
- public void setUseSelectButton(boolean useSelectButton) {
- this.useSelectButton = useSelectButton;
- }
-
+
+ public Vector getItems() {
+ return items;
+ }
+
+ public void actionPerformed(String actionCommand) {
+
+ if(selectButton.getActionCommand().equals(actionCommand)) {
+
+ fireActionPerformed();
+ }
+
+ }
+
+ public boolean isUseSelectButton() {
+ return useSelectButton;
+ }
+
+ public void setUseSelectButton(boolean useSelectButton) {
+ this.useSelectButton = useSelectButton;
+ }
+
public String toString() {
return super.toString() + items;
}
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-15 21:03:11 UTC (rev 38)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-17 09:15:22 UTC (rev 39)
@@ -511,7 +511,17 @@
g.clipRect(viewX, viewY, viewWidth, viewHeight);
}
+ /**
+ * as the is ALWAYS fully covered by its component, is uses that too, to work this out
+ */
+ public boolean isOpaque() {
+ boolean mine = super.isOpaque();
+ if (!mine) {
+ return getComponent().isOpaque();
+ }
+ else {
+ return mine;
+ }
+ }
-
-
}
Modified: SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-15 21:03:11 UTC (rev 38)
+++ SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-17 09:15:22 UTC (rev 39)
@@ -1,178 +1,252 @@
-/*
- * This file is part of 'yura.net Swing ME'.
- *
- * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 'yura.net Swing ME' is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.yura.mobile.gui.components;
-
-import java.util.Vector;
-import javax.microedition.lcdui.Graphics;
-import javax.microedition.lcdui.Image;
-import net.yura.mobile.gui.ChangeListener;
-import net.yura.mobile.gui.border.Border;
-import net.yura.mobile.gui.border.CompoundBorder;
-import net.yura.mobile.gui.border.EmptyBorder;
-import net.yura.mobile.gui.border.MatteBorder;
-import net.yura.mobile.gui.cellrenderer.DefaultTabRenderer;
-import net.yura.mobile.gui.cellrenderer.ListCellRenderer;
-import net.yura.mobile.gui.layout.BorderLayout;
-import net.yura.mobile.util.Option;
-
-/**
- * @author Yura Mamyrin
- * @see javax.swing.JTabbedPane
- */
-public class TabbedPane extends Panel implements ChangeListener {
-
- private List tabList;
- private Vector tabs;
- private ScrollPane scroll;
- private int tabPosition;
- private int currentTabIndex;
-
- public TabbedPane() {
- this(Graphics.TOP,new DefaultTabRenderer(Graphics.TOP),new MatteBorder(0, 0, 1, 0, 0x00000000));
-
- //this(Graphics.LEFT,new DefaultTabRenderer(Graphics.LEFT),new MatteBorder(0, 0, 0, 1, 0x00000000));
-
- //this(Graphics.RIGHT,new DefaultTabRenderer(Graphics.RIGHT),new MatteBorder(0, 1, 0, 0, 0x00000000));
-
- //this(Graphics.BOTTOM,new DefaultTabRenderer(Graphics.BOTTOM),new MatteBorder(1, 0, 0, 0, 0x00000000));
-
- }
- public TabbedPane(int a,ListCellRenderer b,Border art) {
-
- setLayout(new BorderLayout());
-
- tabList = new List(null,b,(a==Graphics.TOP || a==Graphics.BOTTOM));
- tabs = new Vector();
-
- tabList.addChangeListener(this);
- scroll = new ScrollPane(tabList,ScrollPane.MODE_SCROLLARROWS);
-
- if (art!=null) {
- scroll.setBorder(new CompoundBorder(
- art,
- new EmptyBorder(art)
- ));
- }
-
- tabPosition = a;
- currentTabIndex = -1;
-
- tabList.background = -1;
-
- }
-
- public void addTab(Panel p) {
- addTab(p.getName(),p);
- }
-
- public void addTab(String title, Component component) {
- addTab(title, null, component);
- }
-
- public void addTab(String title, Image icon, Component component) {
- tabList.addListItem(new Option(null,title,icon));
- tabs.addElement(component);
-
- if (currentTabIndex==-1) {
- setSelectedIndex(0);
- }
- }
-
- public void workoutSize() {
-
- super.workoutSize();
-
- // we can only really do this here
- // as when we have NO tabs added
- // we dont know the thickness of the tab bar
- if (tabPosition==Graphics.TOP || tabPosition==Graphics.BOTTOM) {
- scroll.setSize(width, tabList.getHeight());
- }
- else {
- scroll.setSize(tabList.getWidth(), height);
- }
-
- }
-
- public void changeEvent(int num) {
-
- Component thetabtoAdd = (Component)tabs.elementAt(num);
-
- if (currentTabIndex==-1) {
-
- if (tabPosition==Graphics.TOP || tabPosition==Graphics.LEFT) {
- add(scroll,tabPosition);
- }
-
- add(thetabtoAdd);
-
- if (tabPosition==Graphics.BOTTOM || tabPosition==Graphics.RIGHT) {
- add(scroll,tabPosition);
- }
-
- }
- else {
-
- Component oldTab = (Component)tabs.elementAt(currentTabIndex);
-
- int index = getComponents().indexOf(oldTab);
-
- remove(index);
- insert(thetabtoAdd, index);
- }
-
- currentTabIndex = num;
- revalidate();
-
- }
-
- public void removeAll() {
-
- if (currentTabIndex!=-1) {
-
- remove(scroll);
-
- remove( getComponents().indexOf( tabs.elementAt(currentTabIndex) ) );
-
- tabs.removeAllElements();
- tabList.setListData( new Vector() );
-
- currentTabIndex = -1;
- }
-
- }
-
- public void setSelectedIndex(int a) {
- tabList.setFocusedItemIndex(a);
- }
- public int getSelectedIndex() {
- return tabList.getFocusedItemIndex();
- }
- public int getTabCount() {
- return tabList.getItems().size();
- }
-
- public void setSelectable(boolean a) {
- tabList.setSelectable(a);
- }
-
- public List getList() {
- return tabList;
- }
-
-}
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.yura.mobile.gui.components;
+
+import java.util.Vector;
+import javax.microedition.lcdui.Graphics;
+import javax.microedition.lcdui.Image;
+import net.yura.mobile.gui.ChangeListener;
+import net.yura.mobile.gui.border.Border;
+import net.yura.mobile.gui.border.CompoundBorder;
+import net.yura.mobile.gui.border.EmptyBorder;
+import net.yura.mobile.gui.border.MatteBorder;
+import net.yura.mobile.gui.cellrenderer.DefaultTabRenderer;
+import net.yura.mobile.gui.cellrenderer.ListCellRenderer;
+import net.yura.mobile.gui.layout.BorderLayout;
+import net.yura.mobile.util.Option;
+
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JTabbedPane
+ */
+public class TabbedPane extends Panel implements ChangeListener {
+
+ private List tabList;
+ private Vector tabs;
+ private ScrollPane scroll;
+ private int tabPosition;
+ private int currentTabIndex;
+
+ public TabbedPane() {
+ this(Graphics.TOP,new DefaultTabRenderer(Graphics.TOP),new MatteBorder(0, 0, 1, 0, 0x00000000));
+
+ //this(Graphics.LEFT,new DefaultTabRenderer(Graphics.LEFT),new MatteBorder(0, 0, 0, 1, 0x00000000));
+
+ //this(Graphics.RIGHT,new DefaultTabRenderer(Graphics.RIGHT),new MatteBorder(0, 1, 0, 0, 0x00000000));
+
+ //this(Graphics.BOTTOM,new DefaultTabRenderer(Graphics.BOTTOM),new MatteBorder(1, 0, 0, 0, 0x00000000));
+
+ }
+ public TabbedPane(int a,ListCellRenderer b,Border art) {
+
+ setLayout(new BorderLayout());
+
+ tabList = new List(null,b,(a==Graphics.TOP || a==Graphics.BOTTOM));
+ tabs = new Vector();
+
+ tabList.addChangeListener(this);
+ scroll = new ScrollPane(tabList,ScrollPane.MODE_SCROLLARROWS);
+
+ if (art!=null) {
+ scroll.setBorder(new CompoundBorder(
+ art,
+ new EmptyBorder(art)
+ ));
+ }
+
+ tabPosition = a;
+ currentTabIndex = -1;
+
+ tabList.background = -1;
+
+ }
+
+ /**
+ * @param p the Panel to add
+ * @see javax.swing.JTabbedPane#add(java.awt.Component) JTabbedPane.add
+ */
+ public void addTab(Panel p) {
+ addTab(p.getName(),p);
+ }
+
+ /**
+ * @param title
+ * @param component
+ * @see javax.swing.JTabbedPane#addTab(java.lang.String, java.awt.Component) JTabbedPane.addTab
+ */
+ public void addTab(String title, Component component) {
+ addTab(title, null, component);
+ }
+
+ /**
+ * @param title
+ * @param icon
+ * @param component
+ * @see javax.swing.JTabbedPane#addTab(java.lang.String, javax.swing.Icon, java.awt.Component) JTabbedPane.addTab
+ */
+ public void addTab(String title, Image icon, Component component) {
+ tabList.addElement(new Option(null,title,icon));
+ tabs.addElement(component);
+
+ if (currentTabIndex==-1) {
+ setSelectedIndex(0);
+ }
+ }
+
+ /**
+ * @param a index of tab to remove
+ * @see javax.swing.JTabbedPane#removeTabAt(int) JTabbedPane.removeTabAt
+ */
+ public void removeTabAt(int a) {
+
+ if (tabs.size()==1 && a==0) {
+ removeAll();
+ }
+ else {
+
+ // setup the new tab to be selected
+ if (currentTabIndex==a) {
+ if ((tabs.size()-1) == currentTabIndex) {
+ setSelectedIndex(currentTabIndex-1);
+ }
+ else {
+ setSelectedIndex(currentTabIndex+1);
+ currentTabIndex--;
+ }
+ }
+ else if (currentTabIndex > a) {
+ currentTabIndex--;
+ }
+
+ // actually remove the tab
+ tabList.removeElementAt(a);
+ tabs.removeElementAt(a);
+
+ }
+
+ }
+ /**
+ * @param title
+ * @param icon
+ * @param component
+ * @param tip
+ * @param index
+ * @see javax.swing.JTabbedPane#insertTab(java.lang.String, javax.swing.Icon, java.awt.Component, java.lang.String, int) JTabbedPane.insertTab
+ */
+ public void insertTab(String title, Image icon, Component component, String tip, int index) {
+
+ tabList.getItems().insertElementAt(new Option(null,title,icon), index);
+ tabs.insertElementAt(component,index);
+ if (index <= currentTabIndex) {
+ currentTabIndex++;
+ }
+ setSelectedIndex(index);
+
+ }
+
+ /**
+ * @param index
+ * @return
+ * @see javax.swing.JTabbedPane#getComponentAt(int) JTabbedPane.getComponentAt
+ */
+ public Panel getComponentAt(int index) {
+ return (Panel)tabs.elementAt(index);
+ }
+
+ public void workoutSize() {
+
+ super.workoutSize();
+
+ // we can only really do this here
+ // as when we have NO tabs added
+ // we dont know the thickness of the tab bar
+ if (tabPosition==Graphics.TOP || tabPosition==Graphics.BOTTOM) {
+ scroll.setSize(width, tabList.getHeight());
+ }
+ else {
+ scroll.setSize(tabList.getWidth(), height);
+ }
+
+ }
+
+ public void changeEvent(int num) {
+
+ Component thetabtoAdd = (Component)tabs.elementAt(num);
+
+ if (currentTabIndex==-1) {
+
+ if (tabPosition==Graphics.TOP || tabPosition==Graphics.LEFT) {
+ add(scroll,tabPosition);
+ }
+
+ add(thetabtoAdd);
+
+ if (tabPosition==Graphics.BOTTOM || tabPosition==Graphics.RIGHT) {
+ add(scroll,tabPosition);
+ }
+
+ }
+ else {
+
+ Component oldTab = (Component)tabs.elementAt(currentTabIndex);
+
+ int index = getComponents().indexOf(oldTab);
+
+ remove(index);
+ insert(thetabtoAdd, index);
+ }
+
+ currentTabIndex = num;
+ revalidate();
+
+ }
+
+ public void removeAll() {
+
+ if (currentTabIndex!=-1) {
+
+ remove(scroll);
+ remove( getComponents().indexOf( tabs.elementAt(currentTabIndex) ) );
+
+ tabs.removeAllElements();
+ tabList.setListData( new Vector() );
+
+ currentTabIndex = -1;
+ }
+
+ }
+
+ public void setSelectedIndex(int a) {
+ tabList.setSelectedIndex(a);
+ }
+ public int getSelectedIndex() {
+ return tabList.getSelectedIndex();
+ }
+ public int getTabCount() {
+ return tabList.getItems().size();
+ }
+
+ public void setSelectable(boolean a) {
+ tabList.setSelectable(a);
+ }
+
+ public List getList() {
+ return tabList;
+ }
+
+}
Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-15 21:03:11 UTC (rev 38)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-17 09:15:22 UTC (rev 39)
@@ -257,6 +257,10 @@
}
+ public void setTitle(String s) {
+ label = s;
+ }
+
public void setCaretPosition(int a) {
int extraSpace=10;
Modified: SwingME/src/net/yura/mobile/gui/components/TitleBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TitleBar.java 2008-07-15 21:03:11 UTC (rev 38)
+++ SwingME/src/net/yura/mobile/gui/components/TitleBar.java 2008-07-17 09:15:22 UTC (rev 39)
@@ -14,6 +14,8 @@
*/
public class TitleBar extends Panel implements ActionListener {
+ private Label title;
+
public TitleBar(String title,Image icon,boolean resize,boolean move,boolean hide,boolean max,boolean close) {
super(new BorderLayout());
@@ -52,12 +54,29 @@
}
- add(new Label( title,icon ));
+ this.title = new Label( title,icon );
+
+ add(this.title);
add(buttonPanel,Graphics.RIGHT);
setBackground(0x00AAAAFF);
}
+ /**
+ * @param title the title to be displayed in the frame's border
+ * @see java.awt.Frame#setTitle(java.lang.String) Frame.setTitle
+ */
+ public void setTitle(String title) {
+ this.title.setText(title);
+ }
+ /**
+ * @param img the icon image to be displayed
+ * @see java.awt.Frame#setIconImage(java.awt.Image) Frame.setIconImage
+ */
+ public void setIconImage(Image img) {
+ title.setIcon(img);
+ }
+
private int oldX,oldY;
private boolean move,resize;
private Component old;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-15 21:03:15
|
Revision: 38
http://swingme.svn.sourceforge.net/swingme/?rev=38&view=rev
Author: yuranet
Date: 2008-07-15 14:03:11 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
better menu
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/CommandButton.java
SwingME/src/net/yura/mobile/gui/components/ComboBox.java
SwingME/src/net/yura/mobile/gui/components/Menu.java
SwingME/src/net/yura/mobile/test/MainPane.java
Modified: SwingME/src/net/yura/mobile/gui/CommandButton.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/CommandButton.java 2008-07-15 18:12:52 UTC (rev 37)
+++ SwingME/src/net/yura/mobile/gui/CommandButton.java 2008-07-15 21:03:11 UTC (rev 38)
@@ -35,8 +35,8 @@
}
- public CommandButton(String label,String com,Menu m) {
- this(label,com);
+ public CommandButton(Menu m,String com) {
+ this(m.getText(),com);
menu = m;
}
Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-15 18:12:52 UTC (rev 37)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-15 21:03:11 UTC (rev 38)
@@ -128,11 +128,11 @@
}
- public void paintComponent(Graphics g){
+ public void paintComponent(Graphics g) {
if (nonSelectedImage == null){
- int w = width - height + padding*2;
+ int w = width - getFont().getHeight();
g.setColor( getBorderColor() );
g.drawLine(w , 0, w , height);
Modified: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-15 18:12:52 UTC (rev 37)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-15 21:03:11 UTC (rev 38)
@@ -1,116 +1,145 @@
-package net.yura.mobile.gui.components;
-
-import java.util.Vector;
-import javax.microedition.lcdui.Graphics;
-import javax.microedition.lcdui.Image;
-import net.yura.mobile.gui.ActionListener;
-import net.yura.mobile.gui.CommandButton;
-import net.yura.mobile.gui.DesktopPane;
-import net.yura.mobile.gui.layout.BoxLayout;
-
-/**
- * @author Yura Mamyrin
- */
-public class Menu extends Button {
-
- private Window popup;
- private Panel panel;
- private Menu parentMenu;
- private Component old;
-
- public Menu(String string) {
- super(string);
- makeWindow();
- }
-
- public void fireActionPerformed() {
-
- openMenu(getXInWindow()+owner.getX(), getYInWindow()+owner.getY(), width, height);
-
- }
-
- public Vector getComponents() {
- return panel.getComponents();
- }
-
- public void openMenu(int x, int y, int width, int height) {
-
- old = DesktopPane.getDesktopPane().getFocusedComponent();
-
- panel.workoutSize(); // what out what the needed size is
- panel.doLayout();
- boolean up = (y+height/2 > DesktopPane.getDesktopPane().getHeight()/2);
-
- popup.setSize(panel.getWidthWithBorder(), panel.getHeightWithBorder());
-
- int w = popup.getWidthWithBorder();
- int h = popup.getHeightWithBorder();
-
- if (x+w > DesktopPane.getDesktopPane().getWidth()) {
- x = DesktopPane.getDesktopPane().getWidth() - w;
- }
-
- // TODO if height is too big make it less
-
- popup.setBoundsWithBorder(x, up?(y-h):(y+height), w, h);
- DesktopPane.getDesktopPane().add(popup);
- }
-
- public void removeAll() {
- panel.removeAll();
- }
-
- private void makeWindow() {
-
- popup = new Window();
- popup.setWindowCommand(0, new CommandButton(getText(), "select"));
- popup.setWindowCommand(1, new CommandButton("Cancel", "cancel"));
- popup.setActionListener(this);
- panel = popup.getContentPane();
- panel.setLayout(new BoxLayout(Graphics.VCENTER));
- popup.setContentPane(new ScrollPane(panel));
- popup.setBorder(DesktopPane.getDefaultTheme().menuBorder);
-
- }
-
- public void actionPerformed(String actionCommand) {
-
- DesktopPane.getDesktopPane().remove(popup);
- DesktopPane.getDesktopPane().setFocusedComponent(old);
- super.fireActionPerformed();
-
- if (!"cancel".equals(actionCommand)) {
- ActionListener al = getActionListener();
- if (al!=null) {
- al.actionPerformed(actionCommand);
- }
- }
-
- // cancel the parent menu
- if (parentMenu!=null) { parentMenu.actionPerformed("cancel"); }
-
- }
-
- public void add(Component c) {
- panel.add(c);
-
- if (c instanceof Menu) {
- ((Menu)c).setParentMenu(this);
- }
-
- }
-
- private void setParentMenu(Menu m) {
- parentMenu = m;
- }
-
- public void addMenuItem(String command,String name,Image icon) {
-
- Button b = new Button(name,icon);
- b.setActionCommand(command);
- b.addActionListener(this);
- b.setUseSelectButton(true);
- add(b);
- }
-
-}
+package net.yura.mobile.gui.components;
+
+import java.util.Vector;
+import javax.microedition.lcdui.Canvas;
+import javax.microedition.lcdui.Graphics;
+import javax.microedition.lcdui.Image;
+import net.yura.mobile.gui.ActionListener;
+import net.yura.mobile.gui.CommandButton;
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.layout.BoxLayout;
+import net.yura.mobile.gui.KeyEvent;
+
+/**
+ * @author Yura Mamyrin
+ */
+public class Menu extends Button {
+
+ private Window popup;
+ private Panel panel;
+ private Menu parentMenu;
+ private Component old;
+
+ public Menu(String string) {
+ super(string);
+ makeWindow();
+ }
+
+ public void fireActionPerformed() {
+
+ openMenu(getXInWindow()+owner.getX(), getYInWindow()+owner.getY(), width, height);
+
+ }
+
+ public Vector getComponents() {
+ return panel.getComponents();
+ }
+
+ public void openMenu(int x, int y, int width, int height) {
+
+ old = DesktopPane.getDesktopPane().getFocusedComponent();
+
+ panel.workoutSize(); // what out what the needed size is
+ panel.doLayout();
+ boolean up = (y+height/2 > DesktopPane.getDesktopPane().getHeight()/2);
+
+ popup.setSize(panel.getWidthWithBorder(), panel.getHeightWithBorder());
+
+ int w = popup.getWidthWithBorder();
+ int h = popup.getHeightWithBorder();
+
+ if (x+w > DesktopPane.getDesktopPane().getWidth()) {
+ x = DesktopPane.getDesktopPane().getWidth() - w;
+ }
+
+ // TODO if height is too big make it less
+
+ popup.setBoundsWithBorder(x, up?(y-h):(y+height), w, h);
+ DesktopPane.getDesktopPane().add(popup);
+ }
+
+ public void removeAll() {
+ panel.removeAll();
+ }
+
+ private void makeWindow() {
+
+ popup = new Window();
+ popup.setWindowCommand(0, new CommandButton(getText(), "select"));
+ popup.setWindowCommand(1, new CommandButton("Cancel", "cancel"));
+ popup.setActionListener(this);
+ panel = popup.getContentPane();
+ panel.setLayout(new BoxLayout(Graphics.VCENTER));
+ popup.setContentPane(new ScrollPane(panel));
+ popup.setBorder(DesktopPane.getDefaultTheme().menuBorder);
+
+ }
+
+ public void actionPerformed(String actionCommand) {
+
+ DesktopPane.getDesktopPane().remove(popup);
+ DesktopPane.getDesktopPane().setFocusedComponent(old);
+ super.fireActionPerformed();
+
+ if (!"cancel".equals(actionCommand)) {
+ ActionListener al = getActionListener();
+ if (al!=null) {
+ al.actionPerformed(actionCommand);
+ }
+ }
+
+ // cancel the parent menu
+ if (parentMenu!=null) { parentMenu.actionPerformed("cancel"); }
+
+ }
+
+ public void add(Component c) {
+ panel.add(c);
+
+ if (c instanceof Menu) {
+ ((Menu)c).setParentMenu(this);
+ }
+
+ }
+
+ private void setParentMenu(Menu m) {
+ parentMenu = m;
+ }
+
+ public void addMenuItem(String command,String name,Image icon) {
+
+ Button b = new Button(name,icon);
+ b.setActionCommand(command);
+ b.addActionListener(this);
+ b.setUseSelectButton(true);
+ add(b);
+ }
+
+ public boolean keyEvent(KeyEvent keyEvent) {
+
+ if (keyEvent.justPressedAction(Canvas.RIGHT)) {
+
+ fireActionPerformed();
+ return true;
+ }
+ return super.keyEvent(keyEvent);
+
+ }
+
+ public void workoutSize() {
+
+ super.workoutSize();
+ width = width + getFont().getHeight()/2 + padding;
+
+ }
+
+ public void paintComponent(Graphics g) {
+ super.paintComponent(g);
+
+ int s = getFont().getHeight();
+
+ ScrollPane.drawRightArrow(g, width-s/2-padding, (height-s)/2, s/2, s);
+
+ }
+
+}
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-15 18:12:52 UTC (rev 37)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-15 21:03:11 UTC (rev 38)
@@ -244,18 +244,18 @@
componentTest.add( new List(items,new DefaultListCellRenderer(),false) );
- menu = new Menu("M1");
+ menu = new Menu("Menu");
menu.add(new Button("bob"));
Menu menu2 = new Menu("Sub");
menu2.addActionListener(this);
menu2.add(new Button("fred"));
- menu2.addMenuItem("action","item", null);
+ menu2.addMenuItem("action","item (will close menu)", null);
menu.add(menu2);
}
- addToScrollPane(componentTest, new CommandButton("Menu","popmenu",menu), new CommandButton("Back","mainmenu") );
+ addToScrollPane(componentTest, new CommandButton(menu,"popmenu"), new CommandButton("Back","mainmenu") );
}
else if ("loadpanel".equals(actionCommand)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-15 18:12:59
|
Revision: 37
http://swingme.svn.sourceforge.net/swingme/?rev=37&view=rev
Author: yuranet
Date: 2008-07-15 11:12:52 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
javadoc
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Panel.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java
SwingME/src/net/yura/mobile/gui/layout/Layout.java
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-15 18:03:28 UTC (rev 36)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-15 18:12:52 UTC (rev 37)
@@ -169,10 +169,15 @@
// does nothing, but can be overridden
public void paintComponent(Graphics g) {}
- public void setPreferredSize(int w, int h) {
- preferredWidth = w;
- preferredHeight = h;
- }
+ /**
+ * @param w The preferred Width (can be -1 for no preference)
+ * @param h The preferred Height (can be -1 for no preference)
+ * @see javax.swing.JComponent#setPreferredSize(java.awt.Dimension) JComponent.setPreferredSize
+ */
+ public void setPreferredSize(int w, int h) {
+ preferredWidth = w;
+ preferredHeight = h;
+ }
/**
* works out the current size of this panel
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-15 18:03:28 UTC (rev 36)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-15 18:12:52 UTC (rev 37)
@@ -98,6 +98,9 @@
contentPane.revalidate();
}
+ /**
+ * @see java.awt.Window#pack() Window.pack
+ */
public void pack() {
contentPane.workoutSize();
Modified: SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java 2008-07-15 18:03:28 UTC (rev 36)
+++ SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java 2008-07-15 18:12:52 UTC (rev 37)
@@ -136,8 +136,6 @@
break;
default:
if (h1<comp.getHeightWithBorder()) {
-
- System.out.println(comp.getHeightWithBorder()+"sdfsfd" + panel);
h1 = comp.getHeightWithBorder();
}
break;
Modified: SwingME/src/net/yura/mobile/gui/layout/Layout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/Layout.java 2008-07-15 18:03:28 UTC (rev 36)
+++ SwingME/src/net/yura/mobile/gui/layout/Layout.java 2008-07-15 18:12:52 UTC (rev 37)
@@ -30,9 +30,15 @@
* @see java.awt.LayoutManager#layoutContainer(java.awt.Container) LayoutManager.layoutContainer
*/
void layoutPanel(Panel panel);
-
+
+ /**
+ * @see java.awt.LayoutManager#preferredLayoutSize(java.awt.Container) LayoutManager.preferredLayoutSize
+ */
int getPreferredHeight(Panel panel);
-
+
+ /**
+ * @see java.awt.LayoutManager#preferredLayoutSize(java.awt.Container) LayoutManager.preferredLayoutSize
+ */
int getPreferredWidth(Panel panel);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-15 18:03:31
|
Revision: 36
http://swingme.svn.sourceforge.net/swingme/?rev=36&view=rev
Author: yuranet
Date: 2008-07-15 11:03:28 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
layout totally redone
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java
SwingME/src/net/yura/mobile/gui/components/ComboBox.java
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/Label.java
SwingME/src/net/yura/mobile/gui/components/List.java
SwingME/src/net/yura/mobile/gui/components/Menu.java
SwingME/src/net/yura/mobile/gui/components/Panel.java
SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
SwingME/src/net/yura/mobile/gui/components/Spinner.java
SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
SwingME/src/net/yura/mobile/gui/components/TextField.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java
SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java
SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java
SwingME/src/net/yura/mobile/gui/layout/GridLayout.java
SwingME/src/net/yura/mobile/gui/layout/Layout.java
SwingME/src/net/yura/mobile/test/MainPane.java
SwingME/src/net/yura/mobile/test/SimpleMidlet.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -724,8 +724,6 @@
text.setForeground(0x00000000);
debugwindow.setContentPane( new ScrollPane(text) );
debugwindow.getContentPane().setBackground(0x00FFFFFF);
- //debugwindow.getContentPane().setTransparent(false);
- //debugwindow.getContentPane().doLayout();
add(debugwindow);
debugwindow.setActionListener(debugwindow);
debugwindow.setWindowCommand(1, new CommandButton("OK","hide") );
@@ -854,11 +852,13 @@
Window window = (Window)windows.elementAt(c);
// TODO RESIZE better
- if (window.getX()==0 && window.getY()==0) {
- window.setSize(w, h);
- }
+ //if (window.getX()==0 && window.getY()==0) {
+ window.setBounds(window.getY(),window.getX(),window.getHeight(), window.getWidth());
+ //}
}
+ fullRepaint();
+
}
// this is to fix buttons not being released properly on some phones
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -72,7 +72,7 @@
setBackground(-1);
}
- doLayout();
+ workoutSize();
return this;
}
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -75,7 +75,7 @@
setBorder( cellHasFocus?focus:(isSelected?open:none) );
- doLayout();
+ workoutSize();
return this;
}
Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -51,7 +51,7 @@
}
- public void doLayout() {
+ public void workoutSize() {
if (list!=null) {
Vector items = list.getItems();
@@ -86,7 +86,7 @@
h = height *4;
}
scroll.setSize(width, h);
- scroll.doLayout();
+ scroll.revalidate();
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -166,7 +166,7 @@
false);
}
- public void doLayout() { }
+ public void workoutSize() { }
public void setBackground(int a) {
Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -112,7 +112,7 @@
return padding;
}
- public void doLayout() {
+ public void workoutSize() {
int w = getCombinedWidth();
int h = getCombinedHeight();
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -192,7 +192,7 @@
// workoutItemSize();
//}
- public void doLayout() {
+ public void workoutSize() {
if (items!=null) {
Modified: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -16,6 +16,7 @@
private Window popup;
private Panel panel;
private Menu parentMenu;
+ private Component old;
public Menu(String string) {
super(string);
@@ -33,7 +34,11 @@
}
public void openMenu(int x, int y, int width, int height) {
- panel.doLayout(); // what out what the needed size is
+
+ old = DesktopPane.getDesktopPane().getFocusedComponent();
+
+ panel.workoutSize(); // what out what the needed size is
+ panel.doLayout();
boolean up = (y+height/2 > DesktopPane.getDesktopPane().getHeight()/2);
popup.setSize(panel.getWidthWithBorder(), panel.getHeightWithBorder());
@@ -51,9 +56,9 @@
DesktopPane.getDesktopPane().add(popup);
}
- public void removeAll() {
- panel.removeAll();
- }
+ public void removeAll() {
+ panel.removeAll();
+ }
private void makeWindow() {
@@ -71,6 +76,7 @@
public void actionPerformed(String actionCommand) {
DesktopPane.getDesktopPane().remove(popup);
+ DesktopPane.getDesktopPane().setFocusedComponent(old);
super.fireActionPerformed();
if (!"cancel".equals(actionCommand)) {
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -54,7 +54,7 @@
setLayout(n);
}
-
+
/**
* @param lt the specified layout manager
* @see java.awt.Container#setLayout(java.awt.LayoutManager) Container.setLayout
@@ -65,6 +65,9 @@
}
+ public Hashtable getConstraints() {
+ return constraints;
+ }
public void setOwnerAndParent(Window owner,Panel p){
super.setOwnerAndParent(owner,p);
@@ -159,27 +162,84 @@
}
}
+ protected int preferredWidth=-1;
+ protected int preferredHeight=-1;
+
+
// does nothing, but can be overridden
public void paintComponent(Graphics g) {}
- public void doLayout() {
-
- for(int i = 0; i < components.size(); i++) {
+ public void setPreferredSize(int w, int h) {
+ preferredWidth = w;
+ preferredHeight = h;
+ }
+
+ /**
+ * works out the current size of this panel
+ * (SHOULD NOT BE CALLED OUTSIDE THE FRAMEWORK)
+ */
+ public void workoutSize() {
+
+ for(int i = 0; i < components.size(); i++) {
Component component = (Component)components.elementAt(i);
-
- //if (component instanceof Panel) {
-
- component.doLayout();
- //}
-
+ component.workoutSize();
+
}
+
+ if (preferredWidth!=-1) {
+ width = preferredWidth;
+ }
+ else if (layout!=null) {
+ width = layout.getPreferredWidth(this);
+ }
+
+ if (preferredHeight!=-1) {
+ height = preferredHeight;
+ }
+ else if (layout!=null) {
+ height = layout.getPreferredHeight(this);
+ }
+
+ }
+
+ /**
+ * redo the layout
+ * (SHOULD NOT BE CALLED OUTSIDE THE FRAMEWORK)
+ */
+ public void doLayout() {
if (layout!=null) {
- layout.layoutPanel(this,constraints);
+ layout.layoutPanel(this);
}
+
+ for(int i = 0; i < components.size(); i++) {
+
+ Component component = (Component)components.elementAt(i);
+ if (component instanceof Panel) {
+ ((Panel)component).doLayout();
+ }
+
+ }
+
}
+
+ /**
+ * this means reclac the size of children
+ * and then redo the layout
+ */
+ public void revalidate() {
+
+ for(int i = 0; i < components.size(); i++) {
+
+ Component component = (Component)components.elementAt(i);
+ component.workoutSize();
+ }
+
+ doLayout();
+ }
+
// BREAK OUT!!!
// find next component in this panel
@@ -295,19 +355,6 @@
return name;
}
- // if a layout manager is resizing us, we want to redo the layout of our children
- public void setBoundsWithBorder(int x,int y,int w, int h){
-
- int oldw = width;
- int oldh = height;
-
- super.setBoundsWithBorder(x,y,w,h);
-
- if (oldw!=width || oldh != height) {
- doLayout();
- }
- }
-
public String toString() {
return ((name!=null)?(name+" "):"")+super.toString() + " "+ components;
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -250,20 +250,20 @@
default: throw new RuntimeException();
}
}
-
+
+ /**
+ * we have to do this here, as only here do we already know what OUR size is
+ * so we can resize the content how we want
+ */
public void doLayout() {
-
- super.doLayout();
-
+
int viewHeight=getViewPortHeight();
int viewWidth=getViewPortWidth(viewHeight);
- // another hack to expand to whole area of scrollpane
if (getComponent().getHeight() <viewHeight) {
getComponent().setSize(getComponent().getWidth(), viewHeight);
}
-
-
+
// this is a hack to make it easer to code panels and not have a tiny amount of side scrolling
// as even though this is technically correct, it is very annoying to use this panel
// now panels that are the width of the scrollpane or less are set to the width of the viewPort
@@ -273,17 +273,12 @@
// if we have no lower scroll bar AND the width of the component is less then or equal to the width of the scrollpane
if ( getComponent().getWidth() <= (width-getViewPortX())) {
- //System.out.println("HACK "+getComponent()+" "+viewWidth);
getComponent().setSize(viewWidth, getComponent().getHeight());
- // redo the layout as we have changed the width
- super.doLayout();
-
- // do it again in case it was reset by the layout
- getComponent().setSize(viewWidth, getComponent().getHeight());
-
}
+ super.doLayout();
+
}
public void paintChildren(Graphics g) {
Modified: SwingME/src/net/yura/mobile/gui/components/Spinner.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -82,7 +82,7 @@
super.setSelectable(s);
}
- public void doLayout() {
+ public void workoutSize() {
if (list!=null && !list.isEmpty()) {
Modified: SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -93,8 +93,10 @@
}
}
- public void doLayout() {
+ public void workoutSize() {
+ super.workoutSize();
+
// we can only really do this here
// as when we have NO tabs added
// we dont know the thickness of the tab bar
@@ -104,9 +106,7 @@
else {
scroll.setSize(tabList.getWidth(), height);
}
-
- super.doLayout();
-
+
}
public void changeEvent(int num) {
@@ -137,7 +137,7 @@
}
currentTabIndex = num;
- doLayout();
+ revalidate();
}
Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -134,7 +134,8 @@
private void updateSoftKeys() {
- // put this back in to hide the clear action on phones it is not needed on
+ if (isFocused()) {
+ // put this back in to hide the clear action on phones it is not needed on
//if (!RootPane.hasclearkey) {
if(caretPosition==0){
@@ -144,6 +145,7 @@
DesktopPane.getDesktopPane().setComponentCommand(1,SOFTKEY_CLEAR);
}
//}
+ }
}
public void actionPerformed(String actionCommand) {
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -42,17 +42,6 @@
return actionListener;
}
- /*
- public void pack() {
- if (glasspanecomponent!=null) {
- glasspanecomponent.doLayout();
- }
- else {
- contentPane.setBoundsWithBorder(0,0,width, height);
- contentPane.doLayout();
- }
- }
- */
public void setActionListener(ActionListener actionListener) {
this.actionListener = actionListener;
}
@@ -98,14 +87,24 @@
}
-
- public void setSize(int width, int height){
+ /**
+ * sets the new size and revaliates the window
+ * @param width new Width
+ * @param height new Height
+ */
+ public void setSize(int width, int height) {
super.setSize(width, height);
contentPane.setBoundsWithBorder(0,0,width, height);
+ contentPane.revalidate();
}
+ public void pack() {
+ contentPane.workoutSize();
+ setSize(contentPane.getWidthWithBorder(), contentPane.getHeightWithBorder());
+ }
+
private Component old;
public void setGlassPaneComponent(Panel c) {
Modified: SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -32,20 +32,16 @@
/**
* @see java.awt.BorderLayout#layoutContainer(java.awt.Container) BorderLayout.layoutContainer
*/
- public void layoutPanel(Panel panel, Hashtable cons) {
+ public void layoutPanel(Panel panel) {
Vector components = panel.getComponents();
-
+ Hashtable cons = panel.getConstraints();
+
int top=0;
int bottom=0;
int right=0;
int left=0;
- int w1=0;
- int w2=0;
- int h1=0;
- int h2=0;
-
for (int c=0;c<components.size();c++) {
Component comp = (Component)components.elementAt(c);
@@ -55,37 +51,17 @@
switch (pos.intValue()) {
case Graphics.TOP:
top = comp.getHeightWithBorder();
- if (w1<comp.getWidthWithBorder()) {
- w1 = comp.getWidthWithBorder();
- }
- h2 = h2+ comp.getHeightWithBorder();
break;
case Graphics.BOTTOM:
bottom = comp.getHeightWithBorder();
- if (w1<comp.getWidthWithBorder()) {
- w1 = comp.getWidthWithBorder();
- }
- h2 = h2+ comp.getHeightWithBorder();
break;
case Graphics.RIGHT:
right = comp.getWidthWithBorder();
- w2 = w2 + comp.getWidthWithBorder();
- if (h1<comp.getHeightWithBorder()) {
- h1 = comp.getHeightWithBorder();
- }
break;
case Graphics.LEFT:
left = comp.getWidthWithBorder();
- w2 = w2 + comp.getWidthWithBorder();
- if (h1<comp.getHeightWithBorder()) {
- h1 = comp.getHeightWithBorder();
- }
break;
default:
- w2 = w2 + comp.getWidthWithBorder();
- if (h1<comp.getHeightWithBorder()) {
- h1 = comp.getHeightWithBorder();
- }
break;
}
@@ -93,8 +69,8 @@
}
- int width=Math.max( w1,Math.max(panel.getWidth(),w2) );
- int height=Math.max(panel.getHeight(),h1+h2);
+ int width=panel.getWidth();
+ int height=panel.getHeight();
for (int c=0;c<components.size();c++) {
@@ -127,4 +103,93 @@
}
+ public int getPreferredHeight(Panel panel) {
+ Vector components = panel.getComponents();
+ Hashtable cons = panel.getConstraints();
+
+
+ int h1=0;
+ int h2=0;
+
+ for (int c=0;c<components.size();c++) {
+
+ Component comp = (Component)components.elementAt(c);
+ Integer pos = (Integer)cons.get(comp);
+ int p = (pos==null)?0:pos.intValue();
+
+ switch (p) {
+ case Graphics.TOP:
+ h2 = h2+ comp.getHeightWithBorder();
+ break;
+ case Graphics.BOTTOM:
+ h2 = h2+ comp.getHeightWithBorder();
+ break;
+ case Graphics.RIGHT:
+ if (h1<comp.getHeightWithBorder()) {
+ h1 = comp.getHeightWithBorder();
+ }
+ break;
+ case Graphics.LEFT:
+ if (h1<comp.getHeightWithBorder()) {
+ h1 = comp.getHeightWithBorder();
+ }
+ break;
+ default:
+ if (h1<comp.getHeightWithBorder()) {
+
+ System.out.println(comp.getHeightWithBorder()+"sdfsfd" + panel);
+ h1 = comp.getHeightWithBorder();
+ }
+ break;
+
+ }
+
+
+ }
+
+ return h1+h2;
+ }
+
+ public int getPreferredWidth(Panel panel) {
+ Vector components = panel.getComponents();
+ Hashtable cons = panel.getConstraints();
+
+ int w1=0;
+ int w2=0;
+
+ for (int c=0;c<components.size();c++) {
+
+ Component comp = (Component)components.elementAt(c);
+ Integer pos = (Integer)cons.get(comp);
+ int p = (pos==null)?0:pos.intValue();
+
+ switch (p) {
+ case Graphics.TOP:
+ if (w1<comp.getWidthWithBorder()) {
+ w1 = comp.getWidthWithBorder();
+ }
+ break;
+ case Graphics.BOTTOM:
+ if (w1<comp.getWidthWithBorder()) {
+ w1 = comp.getWidthWithBorder();
+ }
+ break;
+ case Graphics.RIGHT:
+ w2 = w2 + comp.getWidthWithBorder();
+ break;
+ case Graphics.LEFT:
+ w2 = w2 + comp.getWidthWithBorder();
+ break;
+ default:
+ w2 = w2 + comp.getWidthWithBorder();
+ break;
+
+ }
+
+
+ }
+
+ return Math.max( w1,w2 );
+ }
+
}
Modified: SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -42,50 +42,62 @@
/**
* @see javax.swing.BoxLayout#layoutContainer(java.awt.Container) BoxLayout.layoutContainer
*/
- public void layoutPanel(Panel panel, Hashtable cons) {
+ public void layoutPanel(Panel panel) {
- int width = 0;
- int height = 0;
-
Vector components = panel.getComponents();
+ int height = panel.getHeight();
+ int width = panel.getWidth();
+
+ int offset=0;
for (int c=0;c<components.size();c++) {
Component comp = (Component)components.elementAt(c);
+ comp.setBoundsWithBorder((axis==Graphics.HCENTER)?offset:0 , (axis==Graphics.HCENTER)?0:offset, (axis==Graphics.HCENTER)?comp.getWidthWithBorder():width, (axis==Graphics.HCENTER)?height:comp.getHeightWithBorder() );
+ offset = offset + ((axis==Graphics.HCENTER)?comp.getWidthWithBorder():comp.getHeightWithBorder());
+ }
+
+ }
+
+ public int getPreferredHeight(Panel panel) {
+ Vector components = panel.getComponents();
+ int height=0;
+ for (int c=0;c<components.size();c++) {
+
+ Component comp = (Component)components.elementAt(c);
+
if (axis == Graphics.HCENTER) {
- width = width + comp.getWidthWithBorder();
if (height < comp.getHeightWithBorder()) {
height = comp.getHeightWithBorder();
}
}
else {
height = height + comp.getHeightWithBorder();
- if (width < comp.getWidthWithBorder()) {
- width = comp.getWidthWithBorder();
- }
}
}
+ return height;
+ }
- if (height<panel.getHeight()) {
- height = panel.getHeight();
- }
- if (width<panel.getWidth()) {
- width = panel.getWidth();
- }
-
- int offset=0;
+ public int getPreferredWidth(Panel panel) {
+ Vector components = panel.getComponents();
+ int width=0;
for (int c=0;c<components.size();c++) {
Component comp = (Component)components.elementAt(c);
- comp.setBoundsWithBorder((axis==Graphics.HCENTER)?offset:0 , (axis==Graphics.HCENTER)?0:offset, (axis==Graphics.HCENTER)?comp.getWidthWithBorder():width, (axis==Graphics.HCENTER)?height:comp.getHeightWithBorder() );
- offset = offset + ((axis==Graphics.HCENTER)?comp.getWidthWithBorder():comp.getHeightWithBorder());
+ if (axis == Graphics.HCENTER) {
+ width = width + comp.getWidthWithBorder();
+ }
+ else {
+ if (width < comp.getWidthWithBorder()) {
+ width = comp.getWidthWithBorder();
+ }
+ }
+
}
-
- panel.setSize(width,height);
-
+ return width;
}
}
Modified: SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -64,89 +64,132 @@
/**
* @see java.awt.FlowLayout#layoutContainer(java.awt.Container) FlowLayout.layoutContainer
*/
- public void layoutPanel(Panel panel, Hashtable cons) {
+ public void layoutPanel(Panel panel) {
+ int width = panel.getWidth();
+ int height = panel.getHeight();
+
+ Vector components = panel.getComponents();
+
if (align==Graphics.HCENTER) {
-
- int width = panel.getWidth();
- int height = panel.getHeight();
- Vector components = panel.getComponents();
+ // need to get this to know where to centre components
+ int fullwidth = getPreferredWidth(panel);
+
+ int offset = (width - fullwidth)/2 + padding;
- int fullwidth=(components.size()>0)?((components.size()+1)*padding):0;
+ for (int c=0;c<components.size();c++) {
+
+ Component comp = (Component)components.elementAt(c);
+
+ comp.setBoundsWithBorder(offset , (height-comp.getHeightWithBorder())/2, comp.getWidthWithBorder(), comp.getHeightWithBorder() );
+ offset = offset + comp.getWidthWithBorder() + padding;
+ }
+
+ }
+ else {
+
+ int down=padding;
+
+ for (int c=0;c<components.size();c++) {
+
+ Component comp = (Component)components.elementAt(c);
+
+ int cheight = comp.getHeightWithBorder();
+ int cwidth = comp.getWidthWithBorder();
+
+ int offset = (width - cwidth)/2;
+
+ comp.setBoundsWithBorder(offset,down, cwidth, cheight );
+
+ if (cheight!=0) {
+ down = down + cheight + padding;
+ }
+
+ }
+
+ }
+
+ }
+
+ public int getPreferredHeight(Panel panel) {
+
+ Vector components = panel.getComponents();
+
+ if (align==Graphics.HCENTER) {
+
int fullheight=0;
for (int c=0;c<components.size();c++) {
Component comp = (Component)components.elementAt(c);
- fullwidth = fullwidth + comp.getWidthWithBorder();
-
if (fullheight < comp.getHeightWithBorder()+padding*2) {
fullheight = comp.getHeightWithBorder()+padding*2;
}
}
+
+ return fullheight;
+
+ }
+ else {
+
+ int fullheight=(components.size()>0)?((components.size()+1)*padding):0;
- if (fullwidth > width) { width = fullwidth; }
- if (fullheight > height) { height = fullheight; }
+ for (int c=0;c<components.size();c++) {
- int offset = (width - fullwidth)/2 + padding;
+ Component comp = (Component)components.elementAt(c);
+ fullheight = fullheight + comp.getHeightWithBorder();
+
+ }
+
+ return fullheight;
+
+ }
+ }
+
+ public int getPreferredWidth(Panel panel) {
+
+ Vector components = panel.getComponents();
+
+ if (align==Graphics.HCENTER) {
+
+ int fullwidth=(components.size()>0)?((components.size()+1)*padding):0;
+
for (int c=0;c<components.size();c++) {
Component comp = (Component)components.elementAt(c);
- comp.setBoundsWithBorder(offset , (height-comp.getHeightWithBorder())/2, comp.getWidthWithBorder(), comp.getHeightWithBorder() );
- offset = offset + comp.getWidthWithBorder() + padding;
+ fullwidth = fullwidth + comp.getWidthWithBorder();
+
+
+
}
- panel.setSize(width,height);
-
+
+ return fullwidth;
+
}
else {
-
- int fullwidth = panel.getWidth();
- //int compwidth = (fullwidth*4)/5;
- //int offset = (fullwidth - compwidth)/2;
- //int height = panel.getHeight();
- Vector components = panel.getComponents();
+
+ int fullwidth=0;
for (int c=0;c<components.size();c++) {
Component comp = (Component)components.elementAt(c);
+ // we DONT use +padding*2 even though really we should
if ( comp.getWidthWithBorder() > fullwidth) {
- // TODO !(comp instanceof MStringItem) &&
fullwidth = comp.getWidthWithBorder();
}
}
-
- int down=padding;
-
- for (int c=0;c<components.size();c++) {
-
- Component comp = (Component)components.elementAt(c);
-
- int height = comp.getHeightWithBorder();
- int width = comp.getWidthWithBorder();
-
- int offset = (fullwidth - width)/2;
-
- comp.setBoundsWithBorder(offset,down, width, height );
-
- if (height!=0) {
- down = down + height + padding;
- }
-
- }
-
- panel.setSize( fullwidth, down);
-
+ return fullwidth;
}
-
- }
+ }
+
}
Modified: SwingME/src/net/yura/mobile/gui/layout/GridLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/GridLayout.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/layout/GridLayout.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -59,54 +59,94 @@
/**
* @see java.awt.GridLayout#layoutContainer(java.awt.Container) GridLayout.layoutContainer
*/
- public void layoutPanel(Panel panel, Hashtable cons) {
+ public void layoutPanel(Panel panel) {
Vector components = panel.getComponents();
- int ac;
- if (across!=0) {
- ac=across;
- }
- else {
- ac = (components.size()+(down-1)) / down;
- }
+ int ac = getCols(components);
+ int de = getRows(components);
int cwidth = (panel.getWidth() -(ac*padding) -padding) /ac;
- int cheight = 0;
-
- for (int i=0;i<components.size();i++) {
-
- Component comp = (Component)components.elementAt(i);
-
- if (comp.getHeightWithBorder() > cheight) {
-
- cheight = comp.getHeightWithBorder();
-
- }
- if (comp.getWidthWithBorder() > cwidth) {
-
- cwidth = comp.getWidthWithBorder();
- }
- }
+ int cheight = (panel.getHeight() -(de*padding) -padding) /de;
int a=0;
int d=0;
- int maxa=0;
+
for (int i=0;i<components.size();i++) {
Component comp = (Component)components.elementAt(i);
comp.setBoundsWithBorder((a*cwidth)+padding+(padding*a), (d*cheight)+padding+(padding*d), cwidth, cheight);
a++;
- if (a>maxa) { maxa=a;}
// when it gets to the end of the row it adds 1
if (a==ac && i!=(components.size()-1)) {
a=0;
d++;
}
}
- d++;
- panel.setSize( (maxa*cwidth) +(maxa*padding) +padding, (d*cheight) +(d*padding) +padding );
+
}
+ public int getPreferredHeight(Panel panel) {
+
+ Vector components = panel.getComponents();
+ int cheight = 0;
+ int de = getRows(components);
+
+ for (int i=0;i<components.size();i++) {
+ Component comp = (Component)components.elementAt(i);
+ if (comp.getHeightWithBorder() > cheight) {
+ cheight = comp.getHeightWithBorder();
+ }
+
+ }
+ return de * cheight + de*padding +padding;
+
+ }
+
+ public int getPreferredWidth(Panel panel) {
+
+ Vector components = panel.getComponents();
+
+ int cwidth = 0;
+ int ac = getCols(components);
+
+ for (int i=0;i<components.size();i++) {
+ Component comp = (Component)components.elementAt(i);
+ if (comp.getWidthWithBorder() > cwidth) {
+ cwidth = comp.getWidthWithBorder();
+ }
+ }
+
+ return ac * cwidth + ac*padding +padding;
+ }
+
+ private int getCols(Vector components) {
+
+ int ac;
+ if (across!=0) {
+ ac=across;
+ }
+ else {
+ ac = (components.size()+(down-1)) / down;
+ }
+
+ if (components.size() < ac) { ac=components.size(); }
+
+ return ac;
+ }
+ private int getRows(Vector components) {
+ int de;
+ if (down!=0) {
+ de=down;
+ }
+ else {
+ de = (components.size()+(across-1)) / across;
+ }
+
+ if (components.size() < de) { de=components.size(); }
+
+ return de;
+ }
+
}
Modified: SwingME/src/net/yura/mobile/gui/layout/Layout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/Layout.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/gui/layout/Layout.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -17,8 +17,6 @@
package net.yura.mobile.gui.layout;
-import java.util.Hashtable;
-
import net.yura.mobile.gui.components.Panel;
/**
@@ -31,6 +29,10 @@
/**
* @see java.awt.LayoutManager#layoutContainer(java.awt.Container) LayoutManager.layoutContainer
*/
- void layoutPanel(Panel panel, Hashtable cons);
+ void layoutPanel(Panel panel);
+
+ int getPreferredHeight(Panel panel);
+
+ int getPreferredWidth(Panel panel);
}
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -135,9 +135,13 @@
Window test1 = new Window( new LineBorder() );
test1.getContentPane().add( new TitleBar("Window Title",image,true,true,true,true,true),Graphics.TOP);
test1.getContentPane().add(new Label("LALAL TEST 1"));
+ test1.getContentPane().setBackground(0x00FFFFFF);
+
test1.setBounds(10, 10, getWidth()-20, getHeight()/2);
- test1.getContentPane().doLayout();
- test1.getContentPane().setBackground(0x00FFFFFF);
+
+ // Test that pack method works too
+ //test1.pack();
+
add(test1);
}
@@ -280,9 +284,10 @@
message = "unable to load: "+e.toString();
e.printStackTrace();
}
- loadPanel.setSize( getWidth()-ScrollPane.getBarThickness(getWidth(), getHeight()) , loadPanel.getHeight());
+ //loadPanel.setSize( getWidth()-ScrollPane.getBarThickness(getWidth(), getHeight()) , loadPanel.getHeight());
loadPanel.append(message+"\n");
//getContentPane().doLayout();
+ mainWindow.getContentPane().revalidate();
mainWindow.getContentPane().repaint();
}
else if ("borderTest".equals(actionCommand)) {
@@ -392,7 +397,7 @@
scroll.removeAll();
scroll.add(a);
- mainWindow.getContentPane().doLayout();
+ mainWindow.getContentPane().revalidate();
mainWindow.setWindowCommand(0, b);
mainWindow.setWindowCommand(1, c);
Modified: SwingME/src/net/yura/mobile/test/SimpleMidlet.java
===================================================================
--- SwingME/src/net/yura/mobile/test/SimpleMidlet.java 2008-07-14 15:32:09 UTC (rev 35)
+++ SwingME/src/net/yura/mobile/test/SimpleMidlet.java 2008-07-15 18:03:28 UTC (rev 36)
@@ -52,7 +52,7 @@
mainWindow.getContentPane().setBackground( 0x00EEEEEE );
mainWindow.getContentPane().setLayout( new FlowLayout() );
mainWindow.getContentPane().add( new Label("Hello World!") );
- mainWindow.getContentPane().doLayout();
+ mainWindow.getContentPane().revalidate();
}
public void actionPerformed(String actionCommand) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-14 15:32:10
|
Revision: 35
http://swingme.svn.sourceforge.net/swingme/?rev=35&view=rev
Author: yuranet
Date: 2008-07-14 08:32:09 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
better screen resize
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java
SwingME/src/net/yura/mobile/gui/components/Menu.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-14 14:44:13 UTC (rev 34)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-14 15:32:09 UTC (rev 35)
@@ -339,7 +339,7 @@
private boolean sideSoftKeys;
private Component getSoftkeyRenderer(int i) {
// if (theme==null || theme.softkeyRenderer==null) return null; // sometimes throws on emulator
- Component com = theme.softkeyRenderer.getListCellRendererComponent(null, getCurrentCommands()[i], i, sideSoftKeys, false);
+ Component com = theme.softkeyRenderer.getListCellRendererComponent(null, getCurrentCommands()[i], i, sideSoftKeys && (i==1), !sideSoftKeys && (i==0));
if (com==null) return null;
int h = com.getHeightWithBorder();
int w = com.getWidthWithBorder();
@@ -839,7 +839,10 @@
protected void sizeChanged(int w, int h) {
//#debug
- System.out.println("sizeChanged!!");
+ System.out.println("sizeChanged!! " +paintdone);
+
+ if (!paintdone) return;
+
if (w>h) {
sideSoftKeys = true;
}
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java 2008-07-14 14:44:13 UTC (rev 34)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java 2008-07-14 15:32:09 UTC (rev 35)
@@ -16,9 +16,10 @@
setBackground(0x00FFFFFF);
}
- public Component getListCellRendererComponent(List list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ public Component getListCellRendererComponent(List list, Object value, int index, boolean top, boolean left) {
if (value==null) return null;
text = value.toString();
+ //text = (top?"top":"bottom") + " " + (left?"left":"right");
height = DesktopPane.getDefaultTheme().font.getHeight();
width = DesktopPane.getDesktopPane().getWidth()/2 - 10;
return this;
Modified: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-14 14:44:13 UTC (rev 34)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-14 15:32:09 UTC (rev 35)
@@ -38,12 +38,16 @@
popup.setSize(panel.getWidthWithBorder(), panel.getHeightWithBorder());
- int h2 = popup.getHeightWithBorder();
- int w2 = popup.getWidthWithBorder();
-
+ int w = popup.getWidthWithBorder();
+ int h = popup.getHeightWithBorder();
+
+ if (x+w > DesktopPane.getDesktopPane().getWidth()) {
+ x = DesktopPane.getDesktopPane().getWidth() - w;
+ }
+
// TODO if height is too big make it less
- popup.setBoundsWithBorder(x, up?(y-h2):(y+height), w2, h2);
+ popup.setBoundsWithBorder(x, up?(y-h):(y+height), w, h);
DesktopPane.getDesktopPane().add(popup);
}
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-14 14:44:13 UTC (rev 34)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-14 15:32:09 UTC (rev 35)
@@ -304,7 +304,6 @@
DesktopPane.getDesktopPane().windowRepaint();
}
else {
- System.out.println("sdfsdfsdfsfsdf 77");
DesktopPane.getDesktopPane().fullRepaint();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-14 14:44:18
|
Revision: 34
http://swingme.svn.sourceforge.net/swingme/?rev=34&view=rev
Author: yuranet
Date: 2008-07-14 07:44:13 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
textfield carret movement better
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/TextField.java
Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-14 14:11:54 UTC (rev 33)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-14 14:44:13 UTC (rev 34)
@@ -209,6 +209,9 @@
setCaretPosition(caretPosition-1);
return true;
}
+ else {
+ return !keyEvent.justPressedAction(Canvas.LEFT);
+ }
}
else if (keyEvent.isDownAction(Canvas.RIGHT)) {
@@ -222,6 +225,9 @@
setCaretPosition(caretPosition+1);
return true;
}
+ else {
+ return !keyEvent.justPressedAction(Canvas.RIGHT);
+ }
}
else if (keyEvent.justPressedAction(Canvas.FIRE)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-14 14:12:00
|
Revision: 33
http://swingme.svn.sourceforge.net/swingme/?rev=33&view=rev
Author: yuranet
Date: 2008-07-14 07:11:54 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
spinner text color
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Spinner.java
Modified: SwingME/src/net/yura/mobile/gui/components/Spinner.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-14 14:06:29 UTC (rev 32)
+++ SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-14 14:11:54 UTC (rev 33)
@@ -30,6 +30,7 @@
public class Spinner extends Label {
+ // TODO: may need more images
private Image selectedImage;
private Image nonSelectedImage;
@@ -37,14 +38,18 @@
private Vector list;
- private Border borderColor;
- private Border activeBorderColor;
+ private Border normalBorder;
+ private Border activeBorder;
private boolean continuous = false;
private boolean leftPress = false;
private boolean rightPress = false;
+ private int normalForeground;
+ private int activeForeground;
+ private int disabledForeground;
+
public Spinner() {
this(new Vector(), false);
}
@@ -54,16 +59,29 @@
continuous = cont;
setData(vec);
- setForegroundByFontColorIndex(0);
+ normalBorder = DesktopPane.getDefaultTheme().normalBorder;
+ activeBorder = DesktopPane.getDefaultTheme().activeBorder;
- borderColor = DesktopPane.getDefaultTheme().normalBorder;
- activeBorderColor = DesktopPane.getDefaultTheme().activeBorder;
-
selectable = true;
setHorizontalAlignment(Graphics.HCENTER);
+
+ activeForeground = DesktopPane.getDefaultTheme().activeForeground;
+ disabledForeground = DesktopPane.getDefaultTheme().disabledForeground;
+ normalForeground = DesktopPane.getDefaultTheme().foreground;
+
}
+ public void setSelectable(boolean s) {
+ if (s) {
+ foreground = normalForeground;
+ }
+ else {
+ foreground = disabledForeground;
+ }
+ super.setSelectable(s);
+ }
+
public void doLayout() {
if (list!=null && !list.isEmpty()) {
@@ -90,8 +108,8 @@
}
- int w = maxWidth + getArrowWidth()*2 + gap*2 + borderColor.getLeft() + borderColor.getRight() + padding*2;
- int h = maxHeight + borderColor.getTop() + borderColor.getBottom() + padding*2;
+ int w = maxWidth + getArrowWidth()*2 + gap*2 + normalBorder.getLeft() + normalBorder.getRight() + padding*2;
+ int h = maxHeight + normalBorder.getTop() + normalBorder.getBottom() + padding*2;
if (w > width) width = w;
if (h > height) height = h;
@@ -158,11 +176,11 @@
int arrowWidth = getArrowWidth();
- Border b = isFocused()?activeBorderColor:borderColor;
+ Border b = isFocused()?activeBorder:normalBorder;
- g.translate(arrowWidth+gap+borderColor.getLeft(), borderColor.getTop());
- b.paintBorder(this, g, width -gap*2 - arrowWidth*2 -borderColor.getLeft() - borderColor.getRight(), height-borderColor.getTop() - borderColor.getBottom());
- g.translate(-arrowWidth-gap-borderColor.getLeft(), -borderColor.getTop());
+ g.translate(arrowWidth+gap+normalBorder.getLeft(), normalBorder.getTop());
+ b.paintBorder(this, g, width -gap*2 - arrowWidth*2 -normalBorder.getLeft() - normalBorder.getRight(), height-normalBorder.getTop() - normalBorder.getBottom());
+ g.translate(-arrowWidth-gap-normalBorder.getLeft(), -normalBorder.getTop());
if (nonSelectedImage != null) {
@@ -195,18 +213,18 @@
int xoffset = 0;
if (horizontalAlignment==Graphics.LEFT) {
- xoffset = arrowWidth+gap+borderColor.getLeft();
+ xoffset = arrowWidth+gap+normalBorder.getLeft();
}
else if (horizontalAlignment==Graphics.RIGHT) {
- xoffset = -arrowWidth-gap-borderColor.getRight();
+ xoffset = -arrowWidth-gap-normalBorder.getRight();
}
int yoffset=0;
if (verticalAlignment==Graphics.TOP) {
- yoffset = borderColor.getTop();
+ yoffset = normalBorder.getTop();
}
else if (verticalAlignment==Graphics.BOTTOM) {
- yoffset = -borderColor.getBottom();
+ yoffset = -normalBorder.getBottom();
}
g.translate(xoffset, yoffset);
@@ -248,35 +266,35 @@
}
public int getMaxTextWidth() {
- return width - getArrowWidth()*2 - gap*2 - borderColor.getLeft() - borderColor.getRight() - padding*2;
+ return width - getArrowWidth()*2 - gap*2 - normalBorder.getLeft() - normalBorder.getRight() - padding*2;
}
public void focusLost() {
super.focusLost();
- setForegroundByFontColorIndex(0);
+ foreground = normalForeground;
repaint();
}
public void focusGained() {
super.focusGained();
- setForegroundByFontColorIndex(1);
+ foreground = activeForeground;
repaint();
}
public Border getActiveBorder() {
- return activeBorderColor;
+ return activeBorder;
}
public void setActiveBorder(Border activeBorderColor) {
- this.activeBorderColor = activeBorderColor;
+ this.activeBorder = activeBorderColor;
}
public Border getNormalBorder() {
- return borderColor;
+ return normalBorder;
}
public void setNormalBorderColor(Border borderColor) {
- this.borderColor = borderColor;
+ this.normalBorder = borderColor;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-14 14:06:30
|
Revision: 32
http://swingme.svn.sourceforge.net/swingme/?rev=32&view=rev
Author: yuranet
Date: 2008-07-14 07:06:29 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
got rid of old method
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/Theme.java
SwingME/src/net/yura/mobile/gui/components/Button.java
SwingME/src/net/yura/mobile/gui/components/Label.java
Modified: SwingME/src/net/yura/mobile/gui/Theme.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-14 13:23:14 UTC (rev 31)
+++ SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-14 14:06:29 UTC (rev 32)
@@ -32,6 +32,8 @@
// Items info
public int background;
public int foreground;
+ public int activeForeground;
+ public int disabledForeground;
public Border normalBorder;
public Border activeBorder;
@@ -54,10 +56,12 @@
defaultWidth = a;
background = 0x00FFFFFF;
- foreground = 0;
+ foreground = 0x00000000;
+ activeForeground = 0x000000FF;
+ disabledForeground = 0x00808080;
normalBorder = new LineBorder(0x00808080);
- activeBorder = new LineBorder(0);
+ activeBorder = new LineBorder(0x00000000);
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-14 13:23:14 UTC (rev 31)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-14 14:06:29 UTC (rev 32)
@@ -44,6 +44,10 @@
protected Border normalBorder;
protected Border activeBorder;
+ private int normalForeground;
+ private int activeForeground;
+ private int disabledForeground;
+
private ActionListener al;
private String actionCommand;
@@ -94,10 +98,22 @@
setActiveBorder(c);
selectable = true;
- setForegroundByFontColorIndex(0);
+ activeForeground = DesktopPane.getDefaultTheme().activeForeground;
+ disabledForeground = DesktopPane.getDefaultTheme().disabledForeground;
+ normalForeground = DesktopPane.getDefaultTheme().foreground;
}
+ public void setSelectable(boolean s) {
+ if (s) {
+ foreground = normalForeground;
+ }
+ else {
+ foreground = disabledForeground;
+ }
+ super.setSelectable(s);
+ }
+
public boolean isSelected() {
return selected;
}
@@ -178,7 +194,7 @@
public void focusLost() {
super.focusLost();
super.setBorder(normalBorder);
- setForegroundByFontColorIndex(0);
+ foreground = normalForeground;
if (useSelectButton) {
DesktopPane.getDesktopPane().setComponentCommand(0, null);
@@ -190,7 +206,7 @@
public void focusGained() {
super.focusGained();
super.setBorder(activeBorder);
- setForegroundByFontColorIndex(1);
+ foreground = activeForeground;
if (useSelectButton) {
DesktopPane.getDesktopPane().setComponentCommand(0, selectButton);
Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-14 13:23:14 UTC (rev 31)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-14 14:06:29 UTC (rev 32)
@@ -288,9 +288,7 @@
*/
public void setFont(Font font) {
this.font = font;
- if (font!=null) {
- setForegroundByFontColorIndex(0);
- }
+
}
/**
@@ -376,16 +374,5 @@
return DesktopPane.getDefaultTheme().defaultWidth;
}
- /**
- * @deprecated
- */
- public void setForegroundByFontColorIndex(int a) {
-
- if (a < font.getColors().length ) {
-
- foreground = font.getColors()[a];
- }
-
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-14 13:23:21
|
Revision: 31
http://swingme.svn.sourceforge.net/swingme/?rev=31&view=rev
Author: yuranet
Date: 2008-07-14 06:23:14 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
menu working
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/Theme.java
SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
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/Menu.java
SwingME/src/net/yura/mobile/gui/components/RadioButton.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/test/MainPane.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -339,7 +339,7 @@
private boolean sideSoftKeys;
private Component getSoftkeyRenderer(int i) {
// if (theme==null || theme.softkeyRenderer==null) return null; // sometimes throws on emulator
- Component com = theme.softkeyRenderer.getListCellRendererComponent(null, getCurrentCommands()[i], i, false, false);
+ Component com = theme.softkeyRenderer.getListCellRendererComponent(null, getCurrentCommands()[i], i, sideSoftKeys, false);
if (com==null) return null;
int h = com.getHeightWithBorder();
int w = com.getWidthWithBorder();
@@ -413,6 +413,7 @@
fullRepaint();
}
else {
+ serviceRepaints();
paintSoftKey=true;
repaint();
}
@@ -559,7 +560,7 @@
- private void softKeyActivated(int i) {
+ public void softKeyActivated(int i) {
CommandButton[] panelCmds = currentWindow.getWindowCommands();
ActionListener actionListener = currentWindow.getActionListener();
Modified: SwingME/src/net/yura/mobile/gui/Theme.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -40,6 +40,7 @@
public int defaultSpace;
public ListCellRenderer softkeyRenderer;
+ public Border menuBorder;
public Theme(){
this(null,0);
Modified: SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -130,6 +130,14 @@
}
}
+
+ /**
+ * @return the icon used for tiling the border or null if a solid color is being used
+ * @see javax.swing.border.MatteBorder#getTileIcon() MatteBorder.getTileIcon
+ */
+ public Image getTileIcon() {
+ return activeimage;
+ }
@@ -199,8 +207,10 @@
}
else if (color!=-1) {
+ boolean fillsides = (imageHeight-imageTop-imageBottom) == 0;
+ boolean filltop = (imageWidth-imageRight-imageLeft) == 0;
g.setColor(color);
- g.fillRect(leftDiff,topDiff,width-leftDiff-rightDiff,height-topDiff-bottomDiff);
+ g.fillRect(fillsides?0:leftDiff,filltop?0:topDiff,width-(fillsides?0:leftDiff+rightDiff),height-(filltop?0:topDiff+bottomDiff));
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -127,8 +127,6 @@
public boolean keyEvent(KeyEvent keyEvent) {
if (keyEvent.justPressedAction(Canvas.FIRE)) {
-
- selected = true;
fireActionPerformed();
@@ -141,10 +139,7 @@
public void pointerEvent(int type, int x, int y) {
super.pointerEvent(type, x, y);
- if (type == DesktopPane.PRESSED) {
- selected=true;
- }
- else if (selected && type == DesktopPane.RELEASED) {
+ if (type == DesktopPane.RELEASED) {
if (x>=0 && x<=width && y>=0 && y<=height) {
fireActionPerformed();
}
@@ -153,17 +148,23 @@
}
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());
- }
+ toggleSelection();
+
+ if (buttonGroup!=null && selected) {
+ // 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());
+ }
+
}
+
+ protected void toggleSelection() {
+ selected=true;
+ }
public void setBorder(Border b) {
normalBorder = b;
Modified: SwingME/src/net/yura/mobile/gui/components/CheckBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -26,8 +26,6 @@
* @see javax.swing.JCheckBox
*/
public class CheckBox extends RadioButton {
-
- private boolean oldState;
public CheckBox(String label,Image a,Image b) {
super(label,a,b);
@@ -37,21 +35,10 @@
super(label);
}
- public void fireActionPerformed() {
-
- if (oldState) selected=false;
-
- super.fireActionPerformed();
+ protected void toggleSelection() {
+ selected=!selected;
+ }
- oldState = selected;
-
- }
-
- public void setSelected(boolean selected) {
- super.setSelected(selected);
- oldState = selected;
- }
-
public void paintExtra(Graphics g) {
int size = getFont().getHeight();
Modified: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -1,5 +1,6 @@
package net.yura.mobile.gui.components;
+import java.util.Vector;
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.Image;
import net.yura.mobile.gui.ActionListener;
@@ -26,21 +27,40 @@
openMenu(getXInWindow()+owner.getX(), getYInWindow()+owner.getY(), width, height);
}
+
+ public Vector getComponents() {
+ return panel.getComponents();
+ }
public void openMenu(int x, int y, int width, int height) {
- popup.setBoundsWithBorder(0, 0, 50, 50);
+ panel.doLayout(); // what out what the needed size is
+ boolean up = (y+height/2 > DesktopPane.getDesktopPane().getHeight()/2);
+
+ popup.setSize(panel.getWidthWithBorder(), panel.getHeightWithBorder());
+
+ int h2 = popup.getHeightWithBorder();
+ int w2 = popup.getWidthWithBorder();
+
+ // TODO if height is too big make it less
+
+ popup.setBoundsWithBorder(x, up?(y-h2):(y+height), w2, h2);
DesktopPane.getDesktopPane().add(popup);
}
+
+ public void removeAll() {
+ panel.removeAll();
+ }
private void makeWindow() {
popup = new Window();
- //popup.setWindowCommand(0, new CommandButton(getText(), "select"));
+ popup.setWindowCommand(0, new CommandButton(getText(), "select"));
popup.setWindowCommand(1, new CommandButton("Cancel", "cancel"));
popup.setActionListener(this);
panel = popup.getContentPane();
panel.setLayout(new BoxLayout(Graphics.VCENTER));
popup.setContentPane(new ScrollPane(panel));
+ popup.setBorder(DesktopPane.getDefaultTheme().menuBorder);
}
@@ -74,11 +94,12 @@
parentMenu = m;
}
- public void addMenuItem(String name,Image icon,String command) {
+ public void addMenuItem(String command,String name,Image icon) {
Button b = new Button(name,icon);
b.setActionCommand(command);
b.addActionListener(this);
+ b.setUseSelectButton(true);
add(b);
}
Modified: SwingME/src/net/yura/mobile/gui/components/RadioButton.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -127,8 +127,8 @@
}
public void fireActionPerformed() {
+ super.fireActionPerformed();
repaint();
- super.fireActionPerformed();
}
public Image getSelectedImage() {
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -42,6 +42,17 @@
return actionListener;
}
+ /*
+ public void pack() {
+ if (glasspanecomponent!=null) {
+ glasspanecomponent.doLayout();
+ }
+ else {
+ contentPane.setBoundsWithBorder(0,0,width, height);
+ contentPane.doLayout();
+ }
+ }
+ */
public void setActionListener(ActionListener actionListener) {
this.actionListener = actionListener;
}
@@ -57,7 +68,7 @@
contentPane.setOwnerAndParent(this,null);
- setBackground(0x00FFFFFF); // set default white background
+ //setBackground(0x00FFFFFF); // set default white background
panelCmds = new CommandButton[2];
setBorder(b);
@@ -88,10 +99,10 @@
}
- public void setSize(int width, int height){
- super.setSize(width, height);
- contentPane.setBoundsWithBorder(0,0,width, height);
- }
+ public void setSize(int width, int height){
+ super.setSize(width, height);
+ contentPane.setBoundsWithBorder(0,0,width, height);
+ }
@@ -293,6 +304,7 @@
DesktopPane.getDesktopPane().windowRepaint();
}
else {
+ System.out.println("sdfsdfsdfsfsdf 77");
DesktopPane.getDesktopPane().fullRepaint();
}
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-11 17:40:00 UTC (rev 30)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-14 13:23:14 UTC (rev 31)
@@ -115,7 +115,7 @@
mainmenu = new Panel( new FlowLayout(Graphics.VCENTER) );
- Label helloWorld = new Label("yura.net mobile");
+ Label helloWorld = new Label("Test App Menu");
mainmenu.add(helloWorld);
addMainMenuButton("Info","info");
@@ -246,7 +246,7 @@
Menu menu2 = new Menu("Sub");
menu2.addActionListener(this);
menu2.add(new Button("fred"));
- menu2.addMenuItem("item", null, "action");
+ menu2.addMenuItem("action","item", null);
menu.add(menu2);
}
@@ -377,17 +377,21 @@
private ScrollPane scroll;
private void addToScrollPane(Component a,CommandButton b,CommandButton c) {
- mainWindow.getContentPane().removeAll();
+
if (scroll==null) {
scroll = new ScrollPane();
+ Label label = new Label("yura.net Mobile");
+ label.setHorizontalAlignment(Graphics.HCENTER);
+ mainWindow.getContentPane().add(label,Graphics.TOP);
+ mainWindow.getContentPane().add(scroll);
+ mainWindow.getContentPane().add(new Label(""),Graphics.BOTTOM);
}
+ scroll.removeAll();
scroll.add(a);
-
- mainWindow.getContentPane().add(scroll);
-
+
mainWindow.getContentPane().doLayout();
mainWindow.setWindowCommand(0, b);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-11 17:40:02
|
Revision: 30
http://swingme.svn.sourceforge.net/swingme/?rev=30&view=rev
Author: yuranet
Date: 2008-07-11 10:40:00 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
still some off repaints
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-11 17:07:01 UTC (rev 29)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-11 17:40:00 UTC (rev 30)
@@ -379,6 +379,7 @@
serviceRepaints();
}
repaint();
+
}
/**
@@ -404,6 +405,7 @@
* Repaint the softkeybar
*/
public void softkeyRepaint(boolean all) {
+
// TODO: is this correct, will ANY repaint do?
// by default calling repaint() like this will do a window repaint
if (all) {
@@ -450,9 +452,9 @@
public void setComponentCommand(int i, CommandButton softkey) {
if (componentCommands[i]!=softkey) {
- CommandButton old = componentCommands[i];
+ CommandButton old = getCurrentCommands()[i]; // get old 1
componentCommands[i] = softkey;
- if (getCurrentCommands()[i]==softkey) {
+ if (getCurrentCommands()[i]==softkey) { // check if we are the new 1
softkeyRepaint(old==null || softkey ==null);
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-11 17:07:01 UTC (rev 29)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-11 17:40:00 UTC (rev 30)
@@ -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);
@@ -188,7 +188,7 @@
}
public void repaint() {
-
+
// if we are not in a window, do nothing
if (owner==null) return;
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-11 17:07:01 UTC (rev 29)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-11 17:40:00 UTC (rev 30)
@@ -274,9 +274,9 @@
public void setWindowCommand(int i, CommandButton softkey) {
if (panelCmds[i]!=softkey) {
- CommandButton oldc = panelCmds[i];
+ CommandButton oldc = DesktopPane.getDesktopPane().getCurrentCommands()[i]; // get old 1
panelCmds[i] = softkey;
- if (DesktopPane.getDesktopPane().getSelectedFrame()==this && DesktopPane.getDesktopPane().getCurrentCommands()[i]==softkey) {
+ if (DesktopPane.getDesktopPane().getCurrentCommands()[i]==softkey) { // check if we are the new 1
DesktopPane.getDesktopPane().softkeyRepaint(oldc==null || softkey == null);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-11 17:07:05
|
Revision: 29
http://swingme.svn.sourceforge.net/swingme/?rev=29&view=rev
Author: yuranet
Date: 2008-07-11 10:07:01 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
better softkeys
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-11 16:23:45 UTC (rev 28)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-11 17:07:01 UTC (rev 29)
@@ -66,6 +66,7 @@
private int background;
private boolean fullrepaint;
+ private boolean paintSoftKey;
private boolean paintdone=false;
private boolean killflag;
@@ -253,7 +254,7 @@
return;
}
- if (!fullrepaint) {
+ if (!fullrepaint && !paintSoftKey) {
boolean ret = paintWindow(g,currentWindow);
if (!ret) {
fullrepaint=true;
@@ -266,6 +267,7 @@
if (fullrepaint) {
fullrepaint = false;
+ paintFirst(g);
for (int c=0;c<windows.size();c++) {
paintWindow(g,(Window)windows.elementAt(c));
}
@@ -282,23 +284,33 @@
}
drawSoftkeys(g);
+ paintLast(g);
}
- private boolean sideSoftKeys;
- private Component getSoftkeyRenderer(int i) {
- if (theme.softkeyRenderer==null) return null;
- Component com = theme.softkeyRenderer.getListCellRendererComponent(null, getCurrentCommands()[i], i, false, false);
- if (com==null) return null;
- int h = com.getHeightWithBorder();
- int w = com.getWidthWithBorder();
- if (sideSoftKeys) {
- com.setBoundsWithBorder(getWidth()-w, (i==0)?(getHeight()-h):0, w, h);
+ public void paintFirst(Graphics g) { }
+ public void paintLast(Graphics g) { }
+
+ private void drawSoftkeys(Graphics g) {
+
+ Component com1 = getSoftkeyRenderer(0);
+
+ if (com1!=null) {
+
+ g.translate(com1.getX(), com1.getY());
+ com1.paint(g);
+ g.translate(-com1.getX(), -com1.getY());
}
- else {
- com.setBoundsWithBorder((i==1)?(getWidth()-w):0, getHeight()-h, w, h);
+
+ Component com2 = getSoftkeyRenderer(1);
+ if (com2!=null) {
+
+ g.translate(com2.getX(), com2.getY());
+ com2.paint(g);
+ g.translate(-com2.getX(), -com2.getY());
}
- return com;
+ paintSoftKey = false;
+
}
private boolean paintWindow(Graphics g,Window w) {
@@ -323,32 +335,24 @@
g.translate(-wx, -wy);
return ret;
}
-
- /**
- * override this to draw softkeys how you want to
- * @param g The Graphics
- */
- public void drawSoftkeys(Graphics g) {
-
- Component com1 = getSoftkeyRenderer(0);
-
- if (com1!=null) {
-
- g.translate(com1.getX(), com1.getY());
- com1.paint(g);
- g.translate(-com1.getX(), -com1.getY());
+
+ private boolean sideSoftKeys;
+ private Component getSoftkeyRenderer(int i) {
+ // if (theme==null || theme.softkeyRenderer==null) return null; // sometimes throws on emulator
+ Component com = theme.softkeyRenderer.getListCellRendererComponent(null, getCurrentCommands()[i], i, false, false);
+ if (com==null) return null;
+ int h = com.getHeightWithBorder();
+ int w = com.getWidthWithBorder();
+ if (sideSoftKeys) {
+ com.setBoundsWithBorder(getWidth()-w, (i==0)?(getHeight()-h):0, w, h);
}
-
- Component com2 = getSoftkeyRenderer(1);
- if (com2!=null) {
-
- g.translate(com2.getX(), com2.getY());
- com2.paint(g);
- g.translate(-com2.getX(), -com2.getY());
+ else {
+ com.setBoundsWithBorder((i==1)?(getWidth()-w):0, getHeight()-h, w, h);
}
-
+ return com;
}
+
// #####################################################################
// Different ways of caling repaint
@@ -399,10 +403,17 @@
/**
* Repaint the softkeybar
*/
- public void softkeyRepaint() {
+ public void softkeyRepaint(boolean all) {
// TODO: is this correct, will ANY repaint do?
// by default calling repaint() like this will do a window repaint
- repaint();
+ if (all) {
+ // we ONLY need to repaint all if the renderer does not paint anything on a null softkey
+ fullRepaint();
+ }
+ else {
+ paintSoftKey=true;
+ repaint();
+ }
}
// #####################################################################
@@ -439,8 +450,11 @@
public void setComponentCommand(int i, CommandButton softkey) {
if (componentCommands[i]!=softkey) {
+ CommandButton old = componentCommands[i];
componentCommands[i] = softkey;
- softkeyRepaint();
+ if (getCurrentCommands()[i]==softkey) {
+ softkeyRepaint(old==null || softkey ==null);
+ }
}
}
@@ -556,7 +570,7 @@
((ActionListener)focusedComponent).actionPerformed( componentCommands[i].getActionCommand() );
- if (componentCommands[i].getMenu()!=null) {
+ if (componentCommands[i]!=null && componentCommands[i].getMenu()!=null) {
Component renderer = getSoftkeyRenderer(i);
componentCommands[i].getMenu().openMenu(renderer.getXWithBorder(),renderer.getYWithBorder(),renderer.getWidthWithBorder(),renderer.getHeightWithBorder());
}
@@ -566,7 +580,7 @@
actionListener.actionPerformed( panelCmds[i].getActionCommand() );
- if (panelCmds[i].getMenu()!=null) {
+ if (panelCmds[i]!=null && panelCmds[i].getMenu()!=null) {
Component renderer = getSoftkeyRenderer(i);
panelCmds[i].getMenu().openMenu(renderer.getXWithBorder(),renderer.getYWithBorder(),renderer.getWidthWithBorder(),renderer.getHeightWithBorder());
}
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-11 16:23:45 UTC (rev 28)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-11 17:07:01 UTC (rev 29)
@@ -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/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-11 16:23:45 UTC (rev 28)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-11 17:07:01 UTC (rev 29)
@@ -274,9 +274,10 @@
public void setWindowCommand(int i, CommandButton softkey) {
if (panelCmds[i]!=softkey) {
+ CommandButton oldc = panelCmds[i];
panelCmds[i] = softkey;
- if (DesktopPane.getDesktopPane().getSelectedFrame()==this) {
- DesktopPane.getDesktopPane().softkeyRepaint();
+ if (DesktopPane.getDesktopPane().getSelectedFrame()==this && DesktopPane.getDesktopPane().getCurrentCommands()[i]==softkey) {
+ DesktopPane.getDesktopPane().softkeyRepaint(oldc==null || softkey == null);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-11 16:23:50
|
Revision: 28
http://swingme.svn.sourceforge.net/swingme/?rev=28&view=rev
Author: yuranet
Date: 2008-07-11 09:23:45 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
menus and much more
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/CommandButton.java
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/KeyEvent.java
SwingME/src/net/yura/mobile/gui/Theme.java
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/ComboBox.java
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
SwingME/src/net/yura/mobile/gui/components/TextField.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/test/MainPane.java
Added Paths:
-----------
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java
SwingME/src/net/yura/mobile/gui/components/Menu.java
SwingME/src/net/yura/mobile/gui/components/TitleBar.java
Modified: SwingME/src/net/yura/mobile/gui/CommandButton.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/CommandButton.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/CommandButton.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -18,6 +18,7 @@
package net.yura.mobile.gui;
import javax.microedition.lcdui.Command;
+import net.yura.mobile.gui.components.Menu;
/**
* @author Yura Mamyrin
@@ -25,7 +26,8 @@
public class CommandButton extends Command {
private String actionCommand;
-
+ private Menu menu;
+
public CommandButton(String label,String com) {
super(label, Command.OK, 1);
@@ -33,6 +35,11 @@
}
+ public CommandButton(String label,String com,Menu m) {
+ this(label,com);
+ menu = m;
+ }
+
public void setActionCommand(String ac) {
actionCommand=ac;
@@ -43,8 +50,21 @@
return actionCommand;
}
+
+ public int hashCode() {
+ int hash = 7;
+ hash = 47 * hash + (this.actionCommand != null ? this.actionCommand.hashCode() : 0);
+ return hash;
+ }
public boolean equals(Object a){
return (a instanceof CommandButton && ((CommandButton) a).getActionCommand().equals(actionCommand));
}
+
+ public Menu getMenu() {
+ return menu;
+ }
+ public String toString() {
+ return getLabel();
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -25,6 +25,7 @@
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.Image;
import net.yura.mobile.gui.border.LineBorder;
+import net.yura.mobile.gui.cellrenderer.DefaultSoftkeyRenderer;
import net.yura.mobile.gui.components.Component;
import net.yura.mobile.gui.components.MultilineLabel;
import net.yura.mobile.gui.components.Panel;
@@ -68,7 +69,7 @@
private boolean paintdone=false;
private boolean killflag;
- private CommandButton[] omponentCommands;
+ private CommandButton[] componentCommands;
// to avoid creating new array every time
private CommandButton[] currentCommands;
@@ -85,7 +86,7 @@
background = back;
splash = sph;
- omponentCommands = new CommandButton[2];
+ componentCommands = new CommandButton[2];
currentCommands = new CommandButton[2];
setFullScreenMode(true);
@@ -185,9 +186,7 @@
if (theme.font==null) {
theme.font=new Font();
}
- if (theme.barHeight==0) {
- theme.barHeight=theme.font.getHeight();
- }
+
if (theme.defaultWidth==0) {
theme.defaultWidth = getWidth()-ScrollPane.getBarThickness(getWidth(), getHeight());
}
@@ -206,7 +205,11 @@
}
- currentWindow.setSize(getWidth(),getHeight()-theme.barHeight);
+ if (theme.softkeyRenderer==null) {
+ theme.softkeyRenderer = new DefaultSoftkeyRenderer();
+ }
+
+ currentWindow.setSize(getWidth(),getHeight());
}
@@ -282,6 +285,22 @@
}
+ private boolean sideSoftKeys;
+ private Component getSoftkeyRenderer(int i) {
+ if (theme.softkeyRenderer==null) return null;
+ Component com = theme.softkeyRenderer.getListCellRendererComponent(null, getCurrentCommands()[i], i, false, false);
+ if (com==null) return null;
+ int h = com.getHeightWithBorder();
+ int w = com.getWidthWithBorder();
+ if (sideSoftKeys) {
+ com.setBoundsWithBorder(getWidth()-w, (i==0)?(getHeight()-h):0, w, h);
+ }
+ else {
+ com.setBoundsWithBorder((i==1)?(getWidth()-w):0, getHeight()-h, w, h);
+ }
+ return com;
+ }
+
private boolean paintWindow(Graphics g,Window w) {
//System.out.println("paintWindow window:"+ w+" component:"+repaintComponent );
@@ -310,29 +329,24 @@
* @param g The Graphics
*/
public void drawSoftkeys(Graphics g) {
+
+ Component com1 = getSoftkeyRenderer(0);
- Font f = getDefaultTheme().font;
+ if (com1!=null) {
- g.setColor( getDefaultTheme().background );
- g.fillRect(0, getHeight() - f.getHeight(), getWidth(), f.getHeight());
+ g.translate(com1.getX(), com1.getY());
+ com1.paint(g);
+ g.translate(-com1.getX(), -com1.getY());
+ }
- g.setColor( f.getColors()[0] );
+ Component com2 = getSoftkeyRenderer(1);
+ if (com2!=null) {
- CommandButton[] buttons = getCurrentCommands();
- String s;
-
- if (buttons[0]!=null) {
-
- s= buttons[0].getLabel();
-
- f.drawString(g,s , ((getWidth()/2)-( f.getWidth(s) ))/2, getHeight() - f.getHeight() , Graphics.TOP | Graphics.LEFT );
+ g.translate(com2.getX(), com2.getY());
+ com2.paint(g);
+ g.translate(-com2.getX(), -com2.getY());
}
- if (buttons[1]!=null) {
- s= buttons[1].getLabel();
-
- f.drawString(g,s ,(getWidth()/2)+ ((getWidth()/2)-( f.getWidth(s) ))/2, getHeight() - f.getHeight() , Graphics.TOP | Graphics.LEFT );
- }
}
// #####################################################################
@@ -414,8 +428,8 @@
}
public CommandButton[] getCurrentCommands(){
- currentCommands[0] = omponentCommands[0] == null ? currentWindow.getWindowCommands()[0] : omponentCommands[0];
- currentCommands[1] = omponentCommands[1] == null ? currentWindow.getWindowCommands()[1] : omponentCommands[1];
+ currentCommands[0] = componentCommands[0] == null ? currentWindow.getWindowCommands()[0] : componentCommands[0];
+ currentCommands[1] = componentCommands[1] == null ? currentWindow.getWindowCommands()[1] : componentCommands[1];
return currentCommands;
}
@@ -424,8 +438,8 @@
*/
public void setComponentCommand(int i, CommandButton softkey) {
- if (omponentCommands[i]!=softkey) {
- omponentCommands[i] = softkey;
+ if (componentCommands[i]!=softkey) {
+ componentCommands[i] = softkey;
softkeyRepaint();
}
@@ -436,54 +450,31 @@
try {
if(keyevent.isDownKey(Canvas.KEY_STAR)){
-
mem = (Runtime.getRuntime().freeMemory() >> 10) +"K/" +(Runtime.getRuntime().totalMemory() >> 10)+"K";
fullRepaint();
}
else {
-
mem = null;
-
}
- CommandButton[] panelCmds = currentWindow.getWindowCommands();
- ActionListener actionListener = currentWindow.getActionListener();
-
- boolean softkey1Action = keyevent.isDownKey(KeyEvent.KEY_SOFTKEY1) || keyevent.justReleasedKey(KeyEvent.KEY_SOFTKEY1);
- boolean softkey2Action = keyevent.isDownKey(KeyEvent.KEY_SOFTKEY2) || keyevent.justReleasedKey(KeyEvent.KEY_SOFTKEY2);
-
- // ############# we use justReleasedKey for firing actions, this means the action is ONLY
- // ############# fired off when the key is released!!!
-
- if (
- focusedComponent!=null && focusedComponent instanceof ActionListener && (
- (omponentCommands[0]!=null && softkey1Action ) ||
- (omponentCommands[1]!=null && softkey2Action )
- )
- ) {
+ CommandButton[] cmds = getCurrentCommands();
- if (omponentCommands[0]!=null && keyevent.justPressedKey(KeyEvent.KEY_SOFTKEY1)) {
- ((ActionListener)focusedComponent).actionPerformed( omponentCommands[0].getActionCommand() );
- }
- else if (omponentCommands[1]!=null && keyevent.justPressedKey(KeyEvent.KEY_SOFTKEY2)) {
- ((ActionListener)focusedComponent).actionPerformed( omponentCommands[1].getActionCommand() );
- }
- }
- else if (
- actionListener!=null && (
- (panelCmds[0]!=null && softkey1Action ) ||
- (panelCmds[1]!=null && softkey2Action )
- )
- ) {
+ if (
+ ( cmds[0]!=null && (keyevent.isDownKey(KeyEvent.KEY_SOFTKEY1) || keyevent.justReleasedKey(KeyEvent.KEY_SOFTKEY1)) ) ||
+ ( cmds[1]!=null && (keyevent.isDownKey(KeyEvent.KEY_SOFTKEY2) || keyevent.justReleasedKey(KeyEvent.KEY_SOFTKEY2)) )
+ ) {
+
+ // ############# we use justReleasedKey for firing actions, this means the action is ONLY
+ // ############# fired off when the key is released!!!
- if (panelCmds[0]!=null && keyevent.justPressedKey(KeyEvent.KEY_SOFTKEY1)) {
- actionListener.actionPerformed( panelCmds[0].getActionCommand() );
- }
- else if (panelCmds[1]!=null && keyevent.justPressedKey(KeyEvent.KEY_SOFTKEY2)) {
- actionListener.actionPerformed( panelCmds[1].getActionCommand() );
- }
-
- }
+ if (keyevent.justPressedKey(KeyEvent.KEY_SOFTKEY1)) {
+ softKeyActivated(0);
+ }
+ else if (keyevent.justPressedKey(KeyEvent.KEY_SOFTKEY2)) {
+ softKeyActivated(1);
+ }
+
+ }
else if (focusedComponent!=null) {
boolean consumed = focusedComponent.keyEvent(keyevent);
@@ -546,6 +537,47 @@
}
}
+
+
+
+
+
+
+ private void softKeyActivated(int i) {
+
+ CommandButton[] panelCmds = currentWindow.getWindowCommands();
+ ActionListener actionListener = currentWindow.getActionListener();
+
+ if (
+ componentCommands[i]!=null &&
+ focusedComponent!=null &&
+ focusedComponent instanceof ActionListener
+ ) {
+
+ ((ActionListener)focusedComponent).actionPerformed( componentCommands[i].getActionCommand() );
+
+ if (componentCommands[i].getMenu()!=null) {
+ Component renderer = getSoftkeyRenderer(i);
+ componentCommands[i].getMenu().openMenu(renderer.getXWithBorder(),renderer.getYWithBorder(),renderer.getWidthWithBorder(),renderer.getHeightWithBorder());
+ }
+
+ }
+ else if (actionListener!=null && panelCmds[i]!=null) {
+
+ actionListener.actionPerformed( panelCmds[i].getActionCommand() );
+
+ if (panelCmds[i].getMenu()!=null) {
+ Component renderer = getSoftkeyRenderer(i);
+ panelCmds[i].getMenu().openMenu(renderer.getXWithBorder(),renderer.getYWithBorder(),renderer.getWidthWithBorder(),renderer.getHeightWithBorder());
+ }
+
+ }
+
+ }
+
+
+
+
// if no command listener is used key events fall though to this method
// used for adding global shortcut keys
public void keyEvent(KeyEvent kypd) { }
@@ -735,7 +767,8 @@
public static final int DRAGGED = 0;
public static final int PRESSED = 1;
public static final int RELEASED = 2;
-
+ private Component pointerComponent;
+
public void pointerDragged(int x, int y) {
pointerEvent(DRAGGED,x,y);
}
@@ -752,7 +785,29 @@
private void pointerEvent(int type, int x, int y){
try {
- currentWindow.pointerEvent(type, x - currentWindow.getX(), y - currentWindow.getY());
+
+ if (type == PRESSED) {
+
+ // check if pressing on a softkey
+ for (int c=0;c<componentCommands.length;c++) {
+ Component comp = getSoftkeyRenderer(c);
+ if (comp!=null) {
+ int cx = comp.getXWithBorder();
+ int cy = comp.getYWithBorder();
+ if (comp!=null && x>=cx && x<=cx+comp.getWidthWithBorder() && y>=cy && y<=cy+comp.getHeightWithBorder()) {
+ softKeyActivated(c);
+ return;
+ }
+ }
+ }
+
+
+ pointerComponent = currentWindow.getComponentAt( x - currentWindow.getX(), y - currentWindow.getY());
+ }
+
+ if (pointerComponent!=null) {
+ pointerComponent.pointerEvent(type, x - currentWindow.getX()-pointerComponent.getXInWindow(), y - currentWindow.getY()-pointerComponent.getYInWindow());
+ }
}
catch(Throwable th) {
th.printStackTrace();
@@ -765,13 +820,23 @@
// other events from the canvas
// #####################################################################
- protected void sizeChanged(int w, int h){
+ protected void sizeChanged(int w, int h) {
+ //#debug
+ System.out.println("sizeChanged!!");
+ if (w>h) {
+ sideSoftKeys = true;
+ }
+ else {
+ sideSoftKeys = false;
+ }
for (int c=0;c<windows.size();c++) {
Window window = (Window)windows.elementAt(c);
- // TODO RESIZE
-
+ // TODO RESIZE better
+ if (window.getX()==0 && window.getY()==0) {
+ window.setSize(w, h);
+ }
}
}
@@ -791,4 +856,5 @@
}
+
}
\ No newline at end of file
Modified: SwingME/src/net/yura/mobile/gui/KeyEvent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/KeyEvent.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/KeyEvent.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -127,15 +127,15 @@
private static final char[] CHARS_42 = new char[] {'*'};
private static final char[] CHARS_35 = new char[] {'#'};
private static final char[] CHARS_48 = new char[] {' ','0'};
- private static final char[] CHARS_49 = new char[] {'.',',','?','!','1'};
- private static final char[] CHARS_50 = new char[] {'a','b','c'};
- private static final char[] CHARS_51 = new char[] {'d','e','f'};
- private static final char[] CHARS_52 = new char[] {'g','h','i'};
- private static final char[] CHARS_53 = new char[] {'j','k','l'};
- private static final char[] CHARS_54 = new char[] {'m','n','o'};
- private static final char[] CHARS_55 = new char[] {'p','q','r','s'};
- private static final char[] CHARS_56 = new char[] {'t','u','v'};
- private static final char[] CHARS_57 = new char[] {'w','x','y','z'};
+ private static final char[] CHARS_49 = new char[] {'.',',','?','!','1','@','\'','-','_'};
+ private static final char[] CHARS_50 = new char[] {'a','b','c','2'};
+ private static final char[] CHARS_51 = new char[] {'d','e','f','3'};
+ private static final char[] CHARS_52 = new char[] {'g','h','i','4'};
+ private static final char[] CHARS_53 = new char[] {'j','k','l','5'};
+ private static final char[] CHARS_54 = new char[] {'m','n','o','6'};
+ private static final char[] CHARS_55 = new char[] {'p','q','r','s','7'};
+ private static final char[] CHARS_56 = new char[] {'t','u','v','8'};
+ private static final char[] CHARS_57 = new char[] {'w','x','y','z','9'};
public static char[] getChars(int keycode,int mode) {
Modified: SwingME/src/net/yura/mobile/gui/Theme.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -19,6 +19,7 @@
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.border.LineBorder;
+import net.yura.mobile.gui.cellrenderer.ListCellRenderer;
public class Theme {
@@ -37,18 +38,18 @@
public int defaultWidth;
public int defaultSpace;
- public int barHeight;
+ public ListCellRenderer softkeyRenderer;
+
public Theme(){
- this(null,0,0);
+ this(null,0);
// these will have defaults setup anyway
}
- public Theme(Font font,int barHeight,int a) {
+ public Theme(Font font,int a) {
this.font = font;
- this.barHeight = barHeight;
defaultWidth = a;
background = 0x00FFFFFF;
@@ -56,7 +57,6 @@
normalBorder = new LineBorder(0x00808080);
activeBorder = new LineBorder(0);
-
}
}
Added: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java (rev 0)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -0,0 +1,34 @@
+package net.yura.mobile.gui.cellrenderer;
+
+import javax.microedition.lcdui.Graphics;
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.components.Component;
+import net.yura.mobile.gui.components.List;
+import net.yura.mobile.gui.Font;
+/**
+ * @author Yura Mamyrin
+ */
+public class DefaultSoftkeyRenderer extends Component implements ListCellRenderer {
+
+ private String text;
+
+ public DefaultSoftkeyRenderer() {
+ setBackground(0x00FFFFFF);
+ }
+
+ public Component getListCellRendererComponent(List list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ if (value==null) return null;
+ text = value.toString();
+ height = DesktopPane.getDefaultTheme().font.getHeight();
+ width = DesktopPane.getDesktopPane().getWidth()/2 - 10;
+ return this;
+ }
+
+ public void paintComponent(Graphics g) {
+ g.setColor(0x00000000);
+ Font f = DesktopPane.getDefaultTheme().font;
+ f.drawString(g, text, (width-f.getWidth(text))/2, (height-f.getHeight())/2, Graphics.TOP | Graphics.LEFT);
+
+ }
+
+}
Property changes on: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultSoftkeyRenderer.java
___________________________________________________________________
Name: svn:executable
+ *
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -120,6 +120,9 @@
actionCommand=ac;
}
+ public ActionListener getActionListener() {
+ return al;
+ }
public boolean keyEvent(KeyEvent keyEvent) {
@@ -142,8 +145,11 @@
selected=true;
}
else if (selected && type == DesktopPane.RELEASED) {
- fireActionPerformed();
+ if (x>=0 && x<=width && y>=0 && y<=height) {
+ fireActionPerformed();
+ }
}
+
}
public void fireActionPerformed() {
Modified: SwingME/src/net/yura/mobile/gui/components/CheckBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -47,6 +47,10 @@
}
+ public void setSelected(boolean selected) {
+ super.setSelected(selected);
+ oldState = selected;
+ }
public void paintExtra(Graphics g) {
Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -102,7 +102,7 @@
y = getYInWindow() + height;
}
- scroll.setPosition(getXInWindow(), y);
+ scroll.setLocation(getXInWindow(), y);
owner.setGlassPaneComponent(scroll);
pbuttons = new CommandButton[2];
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -91,7 +91,7 @@
}
public void setBounds(int posX, int posY, int width, int height) {
- setPosition(posX,posY);
+ setLocation(posX,posY);
setSize(width,height);
}
@@ -100,7 +100,7 @@
this.height = height;
}
- public void setPosition(int posX, int posY){
+ public void setLocation(int posX, int posY){
this.posX = posX;
this.posY = posY;
}
@@ -133,9 +133,17 @@
}
public void pointerEvent(int type, int x, int y) {
- if (selectable && type == DesktopPane.PRESSED) {
- DesktopPane.getDesktopPane().setFocusedComponent(this);
+ if (selectable) {
+ if (type == DesktopPane.PRESSED) {
+ DesktopPane.getDesktopPane().setFocusedComponent(this);
+ }
}
+ else if (parent!=null) {
+ parent.pointerEvent(type,x+posX,y+posY);
+ }
+ else {
+ owner.pointerEvent(type,x+getXInWindow(),y+getYInWindow());
+ }
}
public void animate() { }
Added: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java (rev 0)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -0,0 +1,85 @@
+package net.yura.mobile.gui.components;
+
+import javax.microedition.lcdui.Graphics;
+import javax.microedition.lcdui.Image;
+import net.yura.mobile.gui.ActionListener;
+import net.yura.mobile.gui.CommandButton;
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.layout.BoxLayout;
+
+/**
+ * @author Yura Mamyrin
+ */
+public class Menu extends Button {
+
+ private Window popup;
+ private Panel panel;
+ private Menu parentMenu;
+
+ public Menu(String string) {
+ super(string);
+ makeWindow();
+ }
+
+ public void fireActionPerformed() {
+
+ openMenu(getXInWindow()+owner.getX(), getYInWindow()+owner.getY(), width, height);
+
+ }
+
+ public void openMenu(int x, int y, int width, int height) {
+ popup.setBoundsWithBorder(0, 0, 50, 50);
+ DesktopPane.getDesktopPane().add(popup);
+ }
+
+ private void makeWindow() {
+
+ popup = new Window();
+ //popup.setWindowCommand(0, new CommandButton(getText(), "select"));
+ popup.setWindowCommand(1, new CommandButton("Cancel", "cancel"));
+ popup.setActionListener(this);
+ panel = popup.getContentPane();
+ panel.setLayout(new BoxLayout(Graphics.VCENTER));
+ popup.setContentPane(new ScrollPane(panel));
+
+ }
+
+ public void actionPerformed(String actionCommand) {
+
+ DesktopPane.getDesktopPane().remove(popup);
+ super.fireActionPerformed();
+
+ if (!"cancel".equals(actionCommand)) {
+ ActionListener al = getActionListener();
+ if (al!=null) {
+ al.actionPerformed(actionCommand);
+ }
+ }
+
+ // cancel the parent menu
+ if (parentMenu!=null) { parentMenu.actionPerformed("cancel"); }
+
+ }
+
+ public void add(Component c) {
+ panel.add(c);
+
+ if (c instanceof Menu) {
+ ((Menu)c).setParentMenu(this);
+ }
+
+ }
+
+ private void setParentMenu(Menu m) {
+ parentMenu = m;
+ }
+
+ public void addMenuItem(String name,Image icon,String command) {
+
+ Button b = new Button(name,icon);
+ b.setActionCommand(command);
+ b.addActionListener(this);
+ add(b);
+ }
+
+}
Property changes on: SwingME/src/net/yura/mobile/gui/components/Menu.java
___________________________________________________________________
Name: svn:executable
+ *
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -180,26 +180,6 @@
}
}
-
-
-
-
- public void pointerEvent(int type, int x, int y) {
-
- for(int i = 0; i < components.size(); i++){
- Component component = (Component)components.elementAt(i);
- int x1 = component.getX();
- int y1 = component.getY();
- int x2 = x1 + component.getWidth();
- int y2 = y1 + component.getHeight();
- if( (x > x1 && x < x2) && (y > y1 && y < y2)){
- component.pointerEvent(type, x-x1, y-y1 );
- }
- }
-
- }
-
-
// BREAK OUT!!!
// find next component in this panel
@@ -339,6 +319,24 @@
parent.clip(g);
}
}
+
+ public Component getComponentAt(int x, int y) {
+ for(int i = 0; i < components.size(); i++){
+ Component component = (Component)components.elementAt(i);
+ int x1 = component.getXWithBorder();
+ int y1 = component.getYWithBorder();
+ int x2 = x1 + component.getWidthWithBorder();
+ int y2 = y1 + component.getHeightWithBorder();
+ if( x >= x1 && x <= x2 && y >= y1 && y <= y2){
+
+ if (component instanceof Panel) {
+ return ((Panel)component).getComponentAt( x-component.getX(), y-component.getY() );
+ }
+ return component;
+ }
+ }
+ return this;
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -99,7 +99,7 @@
// ((Panel)a).setScrollPanel(this);
//}
- a.setPosition(getViewPortX(), getViewPortY());
+ a.setLocation(getViewPortX(), getViewPortY());
a.setScrollPanel(this);
Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -125,8 +125,9 @@
private void autoAccept() {
if (tmpChar!=0) {
- insertNewCharacter(tmpChar);
+ char tmp = tmpChar;
tmpChar=0;
+ insertNewCharacter(tmp);
}
}
Added: SwingME/src/net/yura/mobile/gui/components/TitleBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TitleBar.java (rev 0)
+++ SwingME/src/net/yura/mobile/gui/components/TitleBar.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -0,0 +1,148 @@
+package net.yura.mobile.gui.components;
+
+import javax.microedition.lcdui.Canvas;
+import javax.microedition.lcdui.Graphics;
+import javax.microedition.lcdui.Image;
+import net.yura.mobile.gui.ActionListener;
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.KeyEvent;
+import net.yura.mobile.gui.layout.BorderLayout;
+import net.yura.mobile.gui.layout.GridLayout;
+
+/**
+ * @author Yura Mamyrin
+ */
+public class TitleBar extends Panel implements ActionListener {
+
+ public TitleBar(String title,Image icon,boolean resize,boolean move,boolean hide,boolean max,boolean close) {
+
+ super(new BorderLayout());
+
+
+ Panel buttonPanel = new Panel( new GridLayout(1,0,2) );
+ if (resize) {
+ Button b = new Button("#");
+ buttonPanel.add(b);
+ b.addActionListener(this);
+ b.setActionCommand("resize");
+ }
+ if (move) {
+ Button b = new Button("+");
+ buttonPanel.add(b);
+ b.addActionListener(this);
+ b.setActionCommand("move");
+ }
+ if (hide) {
+ Button b = new Button("_");
+ b.addActionListener(this);
+ b.setActionCommand("hide");
+ buttonPanel.add(b);
+ }
+ if (max) {
+ Button b = new Button("[]");
+ b.addActionListener(this);
+ b.setActionCommand("max");
+ buttonPanel.add(b);
+ }
+ if (close) {
+ Button b = new Button("X");
+ b.addActionListener(this);
+ b.setActionCommand("close");
+ buttonPanel.add(b);
+
+ }
+
+ add(new Label( title,icon ));
+ add(buttonPanel,Graphics.RIGHT);
+ setBackground(0x00AAAAFF);
+
+ }
+
+ private int oldX,oldY;
+ private boolean move,resize;
+ private Component old;
+
+ public void pointerEvent(int type, int x, int y) {
+
+ if (type == DesktopPane.PRESSED) {
+ oldX=x;
+ oldY=y;
+
+ }
+ else if (type == DesktopPane.DRAGGED) {
+
+ owner.setLocation(owner.getX()+(x-oldX),owner.getY()+(y-oldY));
+ DesktopPane.getDesktopPane().fullRepaint();
+
+ }
+
+ }
+
+ public boolean keyEvent(KeyEvent keypad) {
+
+ if (keypad.isDownAction(Canvas.LEFT)) {
+
+ if (move) { owner.setLocation(owner.getX()-2,owner.getY()); }
+ else if (resize) { owner.setSize(owner.getWidth()-2, owner.getHeight()); }
+ DesktopPane.getDesktopPane().fullRepaint();
+ return true;
+ }
+ if (keypad.isDownAction(Canvas.RIGHT)) {
+
+ if (move) { owner.setLocation(owner.getX()+2,owner.getY()); }
+ else if (resize) { owner.setSize(owner.getWidth()+2, owner.getHeight()); }
+ DesktopPane.getDesktopPane().fullRepaint();
+ return true;
+ }
+ if (keypad.isDownAction(Canvas.UP)) {
+
+ if (move) { owner.setLocation(owner.getX(),owner.getY()-2); }
+ else if (resize) { owner.setSize(owner.getWidth(), owner.getHeight()-2); }
+ DesktopPane.getDesktopPane().fullRepaint();
+ return true;
+ }
+ if (keypad.isDownAction(Canvas.DOWN)) {
+
+ if (move) { owner.setLocation(owner.getX(),owner.getY()+2); }
+ else if (resize) { owner.setSize(owner.getWidth(), owner.getHeight()+2); }
+ DesktopPane.getDesktopPane().fullRepaint();
+ return true;
+ }
+ if (keypad.isDownAction(Canvas.FIRE)) {
+
+ move = false;
+ resize = false;
+ DesktopPane.getDesktopPane().setFocusedComponent(old);
+ return true;
+ }
+ return false;
+ }
+
+ // if we loseFocus to some random component then resize or move can STILL be true
+ public void actionPerformed(String actionCommand) {
+
+ if (resize || move) {
+ move = false;
+ resize = false;
+ }
+ else if ("move".equals(actionCommand)) {
+
+ old = DesktopPane.getDesktopPane().getFocusedComponent();
+ DesktopPane.getDesktopPane().setFocusedComponent(this);
+ move = true;
+
+ }
+ else if ("resize".equals(actionCommand)) {
+
+ old = DesktopPane.getDesktopPane().getFocusedComponent();
+ DesktopPane.getDesktopPane().setFocusedComponent(this);
+ resize = true;
+
+ }
+ else {
+ owner.actionPerformed(actionCommand);
+ }
+ }
+
+
+}
Property changes on: SwingME/src/net/yura/mobile/gui/components/TitleBar.java
___________________________________________________________________
Name: svn:executable
+ *
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -20,14 +20,11 @@
import java.util.Vector;
import javax.microedition.lcdui.Canvas;
import javax.microedition.lcdui.Graphics;
-
-import javax.microedition.lcdui.Image;
import net.yura.mobile.gui.ActionListener;
import net.yura.mobile.gui.CommandButton;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.layout.BorderLayout;
-import net.yura.mobile.gui.layout.GridLayout;
/**
* @author Yura Mamyrin
@@ -65,39 +62,6 @@
panelCmds = new CommandButton[2];
setBorder(b);
}
-
- public void makeDecoration(String title,Image icon,boolean move,boolean hide,boolean close) {
-
- // TODO
- // Font and color need to be changable
- // move button needs to work, also moving with pointer needs to work
-
- Panel buttonPanel = new Panel( new GridLayout(1,0,2) );
- if (move) {
- buttonPanel.add(new Button("O"));
- }
- if (hide) {
- Button b = new Button("_");
- b.addActionListener(this);
- b.setActionCommand("hide");
- buttonPanel.add(b);
-
- }
- if (close) {
- Button b = new Button("X");
- b.addActionListener(this);
- b.setActionCommand("close");
- buttonPanel.add(b);
-
- }
-
- Panel decoration = new Panel( new BorderLayout() );
- decoration.add(new Label( title,icon ));
- decoration.add(buttonPanel,Graphics.RIGHT);
- decoration.setBackground(0x00AAAAFF);
-
- contentPane.add(decoration,Graphics.TOP);
- }
public void setupFocusedComponent() {
@@ -277,21 +241,27 @@
}
-
- public void pointerEvent(int type, int x, int y){
+ public void pointerEvent(int type, int x, int y) {
- if (glasspanecomponent!=null) {
-
- glasspanecomponent.pointerEvent(type, x - glasspanecomponent.getX(), y - glasspanecomponent.getY());
- }
- else {
-
- contentPane.pointerEvent(type, x, y);
-
- }
- }
+ // TODO to resize the window
+ // if we drag next to the border
+ }
+
+ public Component getComponentAt(int x, int y) {
+
+
+ if (glasspanecomponent!=null) {
+ return glasspanecomponent.getComponentAt( x - glasspanecomponent.getX(), y - glasspanecomponent.getY());
+ }
+ else {
+ return contentPane.getComponentAt( x, y);
+
+ }
+
+ }
+
public void paintComponent(Graphics g) { }
public CommandButton[] getWindowCommands() {
@@ -326,25 +296,37 @@
}
}
+
+ public void actionPerformed(String actionCommand) {
+
+ if ("close".equals(actionCommand)) {
- public void actionPerformed(String actionCommand) {
- if ("close".equals(actionCommand)) {
-
- if (parent==null) {
- DesktopPane.getDesktopPane().remove(this);
+ if (parent==null) {
+ DesktopPane.getDesktopPane().remove(this);
+ }
+ else {
+ parent.remove(this);
+ }
}
- else {
- parent.remove(this);
- }
- }
- if ("hide".equals(actionCommand)) {
-
- if (parent==null) {
- Vector windows = DesktopPane.getDesktopPane().getAllFrames();
- if (windows.size()>1) {
- DesktopPane.getDesktopPane().setSelectedFrame((Window)windows.elementAt(windows.size()-2));
+ else if ("hide".equals(actionCommand)) {
+
+ if (parent==null) {
+ Vector windows = DesktopPane.getDesktopPane().getAllFrames();
+ if (windows.size()>1) {
+ DesktopPane.getDesktopPane().setSelectedFrame((Window)windows.elementAt(windows.size()-2));
+ }
}
}
- }
- }
+ else if ("max".equals(actionCommand)) {
+
+ setBounds(0,0,DesktopPane.getDesktopPane().getWidth(), DesktopPane.getDesktopPane().getHeight());
+ repaint();
+ }
+ else {
+ System.out.println("?? "+actionCommand);
+ }
+
+
+ }
+
}
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-10 23:34:23 UTC (rev 27)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-11 16:23:45 UTC (rev 28)
@@ -48,6 +48,8 @@
import net.yura.mobile.gui.layout.FlowLayout;
import net.yura.mobile.gui.KeyEvent;
import net.yura.mobile.gui.border.MatteBorder;
+import net.yura.mobile.gui.components.Menu;
+import net.yura.mobile.gui.components.TitleBar;
import net.yura.mobile.util.Option;
/**
@@ -60,6 +62,7 @@
private Panel info;
private Panel border;
private Panel tabPanel;
+ private Menu menu;
private Image image;
private MultilineLabel infoLabel;
@@ -130,7 +133,7 @@
else if ("windowTest1".equals(actionCommand)) {
Window test1 = new Window( new LineBorder() );
- test1.makeDecoration("Window Title",image,true,true,true);
+ test1.getContentPane().add( new TitleBar("Window Title",image,true,true,true,true,true),Graphics.TOP);
test1.getContentPane().add(new Label("LALAL TEST 1"));
test1.setBounds(10, 10, getWidth()-20, getHeight()/2);
test1.getContentPane().doLayout();
@@ -156,6 +159,7 @@
default: infoLabel.append("Unknown"); break;
}
infoLabel.repaint();
+
}
public boolean keyEvent(KeyEvent keypad) {
int code1 = keypad.getJustPressedKey();
@@ -235,9 +239,19 @@
componentTest.add( new MultilineLabel("a MultilineLabel with a very long bit of text that will need to go onto more then 1 line") );
componentTest.add( new List(items,new DefaultListCellRenderer(),false) );
+
+ menu = new Menu("M1");
+ menu.add(new Button("bob"));
+
+ Menu menu2 = new Menu("Sub");
+ menu2.addActionListener(this);
+ menu2.add(new Button("fred"));
+ menu2.addMenuItem("item", null, "action");
+ menu.add(menu2);
+
}
- addToScrollPane(componentTest, null, new CommandButton("Back","mainmenu") );
+ addToScrollPane(componentTest, new CommandButton("Menu","popmenu",menu), new CommandButton("Back","mainmenu") );
}
else if ("loadpanel".equals(actionCommand)) {
@@ -288,18 +302,18 @@
test2.setBorder(new MatteBorder("/skin1.skin"));
border.add(test2);
- Panel menu = new Panel(new FlowLayout(Graphics.VCENTER,0));
- menu.setBorder(new MatteBorder("/skin2.skin"));
- menu.add(new Button("menu TEST item 1"));
- menu.add(new Button("menu TEST item 2"));
- menu.add(new Button("menu TEST item 3"));
- menu.add(new Button("menu TEST item 4"));
- border.add(menu);
+ Panel menuTest = new Panel(new FlowLayout(Graphics.VCENTER,0));
+ menuTest.setBorder(new MatteBorder("/skin2.skin"));
+ menuTest.add(new Button("menu TEST item 1"));
+ menuTest.add(new Button("menu TEST item 2"));
+ menuTest.add(new Button("menu TEST item 3"));
+ menuTest.add(new Button("menu TEST item 4"));
+ border.add(menuTest);
- menu = new Panel(new FlowLayout(Graphics.VCENTER,0));
- menu.setBorder(new MatteBorder(10,20,30,40,image));
- menu.add(new Button("MatteBorderTest"));
- border.add(menu);
+ menuTest = new Panel(new FlowLayout(Graphics.VCENTER,0));
+ menuTest.setBorder(new MatteBorder(10,20,30,40,image));
+ menuTest.add(new Button("MatteBorderTest"));
+ border.add(menuTest);
}
addToScrollPane(border, null , new CommandButton("Back","mainmenu") );
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.
|
|
From: <yu...@us...> - 2008-07-10 09:18:12
|
Revision: 26
http://swingme.svn.sourceforge.net/swingme/?rev=26&view=rev
Author: yuranet
Date: 2008-07-10 02:18:06 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
better softkey paint, but not finished yet
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-09 18:47:48 UTC (rev 25)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-10 09:18:06 UTC (rev 26)
@@ -306,6 +306,39 @@
}
/**
+ * override this to draw softkeys how you want to
+ * @param g The Graphics
+ */
+ public void drawSoftkeys(Graphics g) {
+
+ Font f = getDefaultTheme().font;
+
+ g.setColor( getDefaultTheme().background );
+ g.fillRect(0, getHeight() - f.getHeight(), getWidth(), f.getHeight());
+
+ g.setColor( f.getColors()[0] );
+
+ CommandButton[] buttons = getCurrentCommands();
+ String s;
+
+ if (buttons[0]!=null) {
+
+ s= buttons[0].getLabel();
+
+ f.drawString(g,s , ((getWidth()/2)-( f.getWidth(s) ))/2, getHeight() - f.getHeight() , Graphics.TOP | Graphics.LEFT );
+ }
+ if (buttons[1]!=null) {
+
+ s= buttons[1].getLabel();
+
+ f.drawString(g,s ,(getWidth()/2)+ ((getWidth()/2)-( f.getWidth(s) ))/2, getHeight() - f.getHeight() , Graphics.TOP | Graphics.LEFT );
+ }
+ }
+
+ // #####################################################################
+ // Different ways of caling repaint
+
+ /**
* this method should NOT normally be called
* is it called when repaint() is called on a window,
* but that window is currently in the background
@@ -323,7 +356,7 @@
* This is called when u call repaint() on a window
*/
public void windowRepaint() {
- if (repaintComponent != null) {
+ if (repaintComponent != null && paintdone) {
// the repaintComponent may be on another window
serviceRepaints();
}
@@ -347,39 +380,17 @@
repaintComponent = rc;
repaint();
-
}
/**
- * override this to draw softkeys how you want to
- * @param g The Graphics
+ * Repaint the softkeybar
*/
- public void drawSoftkeys(Graphics g) {
+ public void softkeyRepaint() {
+ // TODO: is this correct, will ANY repaint do?
+ // by default calling repaint() like this will do a window repaint
+ repaint();
+ }
- Font f = getDefaultTheme().font;
-
- g.setColor( getDefaultTheme().background );
- g.fillRect(0, getHeight() - f.getHeight(), getWidth(), f.getHeight());
-
- g.setColor( f.getColors()[0] );
-
- CommandButton[] buttons = getCurrentCommands();
- String s;
-
- if (buttons[0]!=null) {
-
- s= buttons[0].getLabel();
-
- f.drawString(g,s , ((getWidth()/2)-( f.getWidth(s) ))/2, getHeight() - f.getHeight() , Graphics.TOP | Graphics.LEFT );
- }
- if (buttons[1]!=null) {
-
- s= buttons[1].getLabel();
-
- f.drawString(g,s ,(getWidth()/2)+ ((getWidth()/2)-( f.getWidth(s) ))/2, getHeight() - f.getHeight() , Graphics.TOP | Graphics.LEFT );
- }
- }
-
// #####################################################################
// action handeling
// #####################################################################
@@ -413,9 +424,10 @@
*/
public void setComponentCommand(int i, CommandButton softkey) {
+ if (omponentCommands[i]!=softkey) {
omponentCommands[i] = softkey;
- repaint();
- // TODO: is this correct, will ANY repaint do? (also in another place)
+ softkeyRepaint();
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-09 18:47:48 UTC (rev 25)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-10 09:18:06 UTC (rev 26)
@@ -303,9 +303,12 @@
*/
public void setWindowCommand(int i, CommandButton softkey) {
+ if (panelCmds[i]!=softkey) {
panelCmds[i] = softkey;
- repaint(); // TODO is this correct, will ANY repaint do? (also in another place)
-
+ if (DesktopPane.getDesktopPane().getSelectedFrame()==this) {
+ DesktopPane.getDesktopPane().softkeyRepaint();
+ }
+ }
}
public String toString() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-09 18:47:50
|
Revision: 25
http://swingme.svn.sourceforge.net/swingme/?rev=25&view=rev
Author: yuranet
Date: 2008-07-09 11:47:48 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
totally new painting system
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/border/Border.java
SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java
SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java
SwingME/src/net/yura/mobile/gui/border/LineBorder.java
SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
SwingME/src/net/yura/mobile/gui/border/TabBorder.java
SwingME/src/net/yura/mobile/gui/components/Button.java
SwingME/src/net/yura/mobile/gui/components/ComboBox.java
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/Panel.java
SwingME/src/net/yura/mobile/gui/components/RadioButton.java
SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
SwingME/src/net/yura/mobile/gui/components/TextField.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/test/MainPane.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -323,7 +323,10 @@
* This is called when u call repaint() on a window
*/
public void windowRepaint() {
- repaintComponent = null;
+ if (repaintComponent != null) {
+ // the repaintComponent may be on another window
+ serviceRepaints();
+ }
repaint();
}
@@ -423,7 +426,7 @@
if(keyevent.isDownKey(Canvas.KEY_STAR)){
mem = (Runtime.getRuntime().freeMemory() >> 10) +"K/" +(Runtime.getRuntime().totalMemory() >> 10)+"K";
- repaint();
+ fullRepaint();
}
else {
@@ -555,6 +558,7 @@
*/
public void setSelectedFrame(Window w) {
if (windows.contains(w)) {
+ setFocusedComponent(null);
currentWindow = w;
windows.removeElement(w);
windows.addElement(w);
@@ -575,6 +579,7 @@
if (w==currentWindow) {
+ setFocusedComponent(null);
currentWindow = (Window)windows.lastElement();
currentWindow.setupFocusedComponent();
}
@@ -658,7 +663,7 @@
text.setForeground(0x00000000);
debugwindow.setContentPane( new ScrollPane(text) );
debugwindow.getContentPane().setBackground(0x00FFFFFF);
- debugwindow.getContentPane().setTransparent(false);
+ //debugwindow.getContentPane().setTransparent(false);
//debugwindow.getContentPane().doLayout();
add(debugwindow);
debugwindow.setActionListener(debugwindow);
Modified: SwingME/src/net/yura/mobile/gui/border/Border.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/Border.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/border/Border.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -50,7 +50,10 @@
* @see javax.swing.border.Border#getBorderInsets(java.awt.Component) Border.getBorderInsets
*/
int getLeft();
-
- //TODO
- // maybe add http://java.sun.com/j2se/1.4.2/docs/api/javax/swing/border/Border.html#isBorderOpaque()
+
+ /**
+ * @return Returns whether or not the border is opaque. If the border is opaque, it is responsible for filling in it's own background when painting.
+ * @see javax.swing.border.Border#isBorderOpaque()
+ */
+ public boolean isBorderOpaque();
}
Modified: SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -107,5 +107,9 @@
public int getLeft() {
return outsideBorder.getLeft() + insideBorder.getLeft();
}
+
+ public boolean isBorderOpaque() {
+ return outsideBorder.isBorderOpaque() || insideBorder.isBorderOpaque();
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -98,4 +98,8 @@
*/
public void paintBorder(Component c, Graphics g, int width,int height) { }
+ public boolean isBorderOpaque() {
+ return false;
+ }
+
}
Modified: SwingME/src/net/yura/mobile/gui/border/LineBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/LineBorder.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/border/LineBorder.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -174,6 +174,8 @@
this.thickness = thickness;
}
-
+ public boolean isBorderOpaque() {
+ return false;
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -208,6 +208,10 @@
}
+ public boolean isBorderOpaque() {
+ return back || (activeimage!=null && color!=-1);
+ }
+
}
Modified: SwingME/src/net/yura/mobile/gui/border/TabBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/TabBorder.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/border/TabBorder.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -158,5 +158,9 @@
public int getLeft() {
return 2;
}
+
+ public boolean isBorderOpaque() {
+ return false;
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -89,7 +89,6 @@
super(label, img);
background = a;
- transparent = false;
setBorder(b);
setActiveBorder(c);
Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -121,7 +121,7 @@
list.setBackground(background);
list.addActionListener(this);
scroll = new ScrollPane(list);
- scroll.setTransparent(false);
+ // TODO setbackground?? scroll.setTransparent(false);
scroll.setBorder(activeBorder);
}
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -31,7 +31,7 @@
public abstract class Component {
protected int posX,posY,width,height;
- protected boolean transparent,selectable;
+ protected boolean selectable;
protected Window owner;
protected Panel parent;
protected int background;
@@ -44,7 +44,6 @@
public Component() {
selectable = true;
- transparent = true;
background = -1;
}
@@ -108,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);
@@ -167,18 +166,31 @@
}
+ /**
+ * Opaque means it fully paint all its pixels
+ * @return true if it is NOT transparent
+ * @see javax.swing.JComponent#isOpaque() JComponent.isOpaque
+ */
+ public boolean isOpaque() {
+ if (background!=-1) return true;
+ if (border!=null) {
+ return border.isBorderOpaque();
+ }
+ return false;
+ }
+
public void repaint() {
// if we are not in a window, do nothing
if (owner==null) return;
- if (transparent) {
+ if (!isOpaque()) {
Panel p=parent;
while (p!=null) {
- if (p.transparent) {
+ if (!p.isOpaque()) {
p = p.parent;
}
else {
@@ -235,15 +247,6 @@
this.border = border;
}
- public boolean isTransparent() {
- return transparent;
- }
-
- public void setTransparent(boolean transparent) {
- this.transparent = transparent;
- }
-
-
public int getWidthWithBorder() {
int w = getWidth();
@@ -412,5 +415,11 @@
}
}
-
+
+
+ public Panel getRootPane() {
+ if (parent == null) { return (Panel)this; }
+ return parent.getRootPane();
+ }
+
}
\ No newline at end of file
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -88,6 +88,9 @@
setCellRenderer(b);
horizontal = h;
setFocusedItemIndex(-1);
+
+ background = DesktopPane.getDefaultTheme().background;
+
}
public void setCellRenderer(ListCellRenderer cellRenderer) {
@@ -270,8 +273,8 @@
setFocusedItemIndex(next);
return true;
}
- else {
- if (horizontal) {
+ //else {
+ if (horizontal && current!=-1) {
Component c = getComponentFor(current);
int y = getYInWindow();
scrollRectToVisible(c.getXWithBorder(),c.getHeightWithBorder()-1,c.getWidthWithBorder(),1,true);
@@ -281,7 +284,7 @@
}
return false;
- }
+ //}
}
else if (keypad.isDownAction(Canvas.UP)) {
@@ -290,8 +293,8 @@
setFocusedItemIndex(prev);
return true;
}
- else {
- if (horizontal) {
+ //else {
+ if (horizontal && current!=-1) {
Component c = getComponentFor(current);
int y = getYInWindow();
scrollRectToVisible(c.getXWithBorder(),0,c.getWidthWithBorder(),1,true);
@@ -300,7 +303,7 @@
}
}
return false;
- }
+ //}
}
else if (keypad.isDownAction(Canvas.RIGHT)) {
@@ -309,10 +312,10 @@
setFocusedItemIndex(next);
return true;
}
- else {
+ //else {
// TODO could get rid of this check and add the X pos to the width
// so you can scroll right even in horizontal mode
- if (!horizontal) {
+ if (!horizontal && current!=-1) {
Component c = getComponentFor(current);
int x = getXInWindow();
scrollRectToVisible(c.getWidthWithBorder()-1,c.getYWithBorder(),1,c.getHeightWithBorder(),true);
@@ -322,7 +325,7 @@
}
return false;
- }
+ //}
}
else if (keypad.isDownAction(Canvas.LEFT)) {
@@ -331,8 +334,8 @@
setFocusedItemIndex(prev);
return true;
}
- else {
- if (!horizontal) {
+ //else {
+ if (!horizontal && current!=-1) {
Component c = getComponentFor(current);
int x = getXInWindow();
scrollRectToVisible(0,c.getYWithBorder(),1,c.getHeightWithBorder(),true);
@@ -342,7 +345,7 @@
}
return false;
- }
+ //}
}
else if (keypad.justPressedAction(Canvas.FIRE)) {
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -236,8 +236,9 @@
}
else if (newone instanceof Panel) {
- ((Panel)newone).breakOutAction(null,direction,false);
+ ((Panel)newone).breakOutAction(null,direction,scrolltothere && DesktopPane.getDesktopPane().getFocusedComponent()==null);
// here we do NOT pass scrolltothere onto the child panel
+ // unless we have NOTHING active, then pss it on to children
// 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
@@ -292,35 +293,7 @@
public Vector getComponents() {
return components;
}
-
- public boolean repaintComponent(Graphics g, Component focusComponent) {
-
- 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){
-
- 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() {
for(int i = 0; i < components.size(); i++){
@@ -360,6 +333,12 @@
return ((name!=null)?(name+" "):"")+super.toString() + " "+ components;
}
+
+ public void clip(Graphics g) {
+ if (parent!=null) {
+ parent.clip(g);
+ }
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/components/RadioButton.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -42,7 +42,7 @@
setBorder(null);
setActiveBorder(null);
background = -1;
- transparent = true;
+
}
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -505,5 +505,18 @@
public void setScrollBarCol(int scrollBarCol) {
this.scrollBarCol = scrollBarCol;
}
+
+ public void clip(Graphics g) {
+
+ int viewX=getXInWindow()+getViewPortX();
+ int viewY=getYInWindow()+getViewPortY();
+ int viewHeight=getViewPortHeight();
+ int viewWidth=getViewPortWidth(viewHeight);
+
+ g.clipRect(viewX, viewY, viewWidth, viewHeight);
+
+ }
+
+
}
Modified: SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -50,6 +50,7 @@
//this(Graphics.RIGHT,new DefaultTabRenderer(Graphics.RIGHT),new MatteBorder(0, 1, 0, 0, 0x00000000));
//this(Graphics.BOTTOM,new DefaultTabRenderer(Graphics.BOTTOM),new MatteBorder(1, 0, 0, 0, 0x00000000));
+
}
public TabbedPane(int a,ListCellRenderer b,Border art) {
@@ -70,6 +71,9 @@
tabPosition = a;
currentTabIndex = -1;
+
+ tabList.background = -1;
+
}
public void addTab(Panel p) {
@@ -166,5 +170,9 @@
public void setSelectable(boolean a) {
tabList.setSelectable(a);
}
+
+ public List getList() {
+ return tabList;
+ }
}
Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -112,8 +112,6 @@
activeTextColor = foreground;
}
- transparent = false;
-
offset = padding;
setText(initialText);
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -61,7 +61,6 @@
contentPane.setOwnerAndParent(this,null);
setBackground(0x00FFFFFF); // set default white background
- transparent = false;
panelCmds = new CommandButton[2];
setBorder(b);
@@ -206,84 +205,53 @@
/**
* This method needs to paint a component IF repaintComponent!=null
* otherwise it needs to repaint the window
+ *
+ * This method can NOT get called if repaintComponent.transparent
+ *
* @return true if it was successful and false otherwise
*/
public boolean paintWindow(Graphics g,Component repaintComponent) {
-
- // first try the glass if we have 1
- if (repaintComponent!=null && glasspanecomponent!=null) {
- boolean result;
-
- // it is the glass but its transparent!
- // so we need to repaint everything
- if (repaintComponent == glasspanecomponent && glasspanecomponent.isTransparent()) {
-
- repaintComponent = null;
- result = false;
- }
- else if (repaintComponent == glasspanecomponent) {
-
- drawGlass(g);
- result = true;
- }
- else {
-
- int gx=glasspanecomponent.getX();
- int gy=glasspanecomponent.getY();
-
- // same as in drawGlass!!
- g.translate(gx, gy);
-
- result = glasspanecomponent.repaintComponent(g,repaintComponent);
-
- g.translate(-gx, -gy);
- }
-
- if (result) {
- return true;
- }
-
- }
-
- // then try the contentpane
- if (repaintComponent!=null) {
-
- boolean done;
-
- if (repaintComponent == contentPane) {
-
- contentPane.paint(g);
- done = true;
- }
- else {
- done = contentPane.repaintComponent(g,repaintComponent);
-
- }
-
- if (done && glasspanecomponent!=null && glasspanecomponent.isTransparent() ) {
-
- // ah crap, we have painted it, but the glass it transparent
- // this is not good at all, we will need to repaint the whole window
- repaintComponent=null;
- }
- else if (done) {
- drawGlass(g);
- return true;
- }
-
- }
-
- // redraw everything
+ // redraw everything
if (repaintComponent==null) {
-
paint(g);
-
return true;
}
- return false;
+ Panel root = repaintComponent.getRootPane();
+ // this component is NOT in this window
+ if (root!=contentPane && root!=glasspanecomponent) {
+ return false;
+ }
+ // if the glass is transparent then we need to repaint everything
+ // as it MAY overlap something in the window
+ if (glasspanecomponent!=null && root!=glasspanecomponent && !glasspanecomponent.isOpaque()) {
+ repaintComponent = contentPane;
+ }
+
+ int a=g.getClipX();
+ int b=g.getClipY();
+ int c=g.getClipWidth();
+ int d=g.getClipHeight();
+ if (repaintComponent.parent!=null) {
+ repaintComponent.parent.clip(g);
+ }
+
+ int x = repaintComponent.getXInWindow();
+ int y = repaintComponent.getYInWindow();
+ g.translate(x, y);
+ repaintComponent.paint(g);
+ g.translate(-x, -y);
+
+ g.setClip(a,b,c,d);
+
+ if (glasspanecomponent!=null && root!=glasspanecomponent) {
+ drawGlass(g);
+ }
+
+ return true;
+
}
public void paint(Graphics g) {
@@ -300,7 +268,7 @@
if (glasspanecomponent!=null) {
int gx=glasspanecomponent.getX();
- int gy=glasspanecomponent.getY();
+ int gy=glasspanecomponent.getY();
g.translate(gx, gy);
glasspanecomponent.paint(g);
@@ -347,7 +315,7 @@
public void repaint() {
- if (this == DesktopPane.getDesktopPane().getSelectedFrame() && !transparent) {
+ if (this == DesktopPane.getDesktopPane().getSelectedFrame() && isOpaque()) {
DesktopPane.getDesktopPane().windowRepaint();
}
else {
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-09 14:56:51 UTC (rev 24)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-09 18:47:48 UTC (rev 25)
@@ -78,7 +78,6 @@
setDefaultTheme( new Theme() );
mainWindow.getContentPane().setBackground(0x00EEEEEE);
- mainWindow.getContentPane().setTransparent(false);
mainWindow.setActionListener(this);
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-09 12:18:15
|
Revision: 23
http://swingme.svn.sourceforge.net/swingme/?rev=23&view=rev
Author: yuranet
Date: 2008-07-09 05:18:14 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
scrollto fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/util/ButtonGroup.java
SwingME/src/net/yura/mobile/util/ImageUtil.java
SwingME/src/net/yura/mobile/util/Option.java
SwingME/src/net/yura/mobile/util/StringUtil.java
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-09 12:15:22 UTC (rev 22)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-09 12:18:14 UTC (rev 23)
@@ -147,8 +147,8 @@
// default focusGained action, make me visible
scrollRectToVisible(
- (border!=null)?border.getLeft():0,
- (border!=null)?border.getTop():0,
+ (border!=null)?-border.getLeft():0,
+ (border!=null)?-border.getTop():0,
getWidthWithBorder(),
getHeightWithBorder(),
false);
Modified: SwingME/src/net/yura/mobile/util/ButtonGroup.java
===================================================================
--- SwingME/src/net/yura/mobile/util/ButtonGroup.java 2008-07-09 12:15:22 UTC (rev 22)
+++ SwingME/src/net/yura/mobile/util/ButtonGroup.java 2008-07-09 12:18:14 UTC (rev 23)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.util;
import java.util.Vector;
Modified: SwingME/src/net/yura/mobile/util/ImageUtil.java
===================================================================
--- SwingME/src/net/yura/mobile/util/ImageUtil.java 2008-07-09 12:15:22 UTC (rev 22)
+++ SwingME/src/net/yura/mobile/util/ImageUtil.java 2008-07-09 12:18:14 UTC (rev 23)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.util;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/util/Option.java
===================================================================
--- SwingME/src/net/yura/mobile/util/Option.java 2008-07-09 12:15:22 UTC (rev 22)
+++ SwingME/src/net/yura/mobile/util/Option.java 2008-07-09 12:18:14 UTC (rev 23)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.util;
import javax.microedition.lcdui.Image;
Modified: SwingME/src/net/yura/mobile/util/StringUtil.java
===================================================================
--- SwingME/src/net/yura/mobile/util/StringUtil.java 2008-07-09 12:15:22 UTC (rev 22)
+++ SwingME/src/net/yura/mobile/util/StringUtil.java 2008-07-09 12:18:14 UTC (rev 23)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.util;
import java.util.Vector;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-09 12:15:23
|
Revision: 22
http://swingme.svn.sourceforge.net/swingme/?rev=22&view=rev
Author: yuranet
Date: 2008-07-09 05:15:22 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
button border fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/ActionListener.java
SwingME/src/net/yura/mobile/gui/ChangeListener.java
SwingME/src/net/yura/mobile/gui/CommandButton.java
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/KeyEvent.java
SwingME/src/net/yura/mobile/gui/Midlet.java
SwingME/src/net/yura/mobile/gui/border/Border.java
SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java
SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java
SwingME/src/net/yura/mobile/gui/border/LineBorder.java
SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
SwingME/src/net/yura/mobile/gui/border/TabBorder.java
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java
SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java
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/Label.java
SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java
SwingME/src/net/yura/mobile/gui/components/ProgressBar.java
SwingME/src/net/yura/mobile/gui/components/RadioButton.java
SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
SwingME/src/net/yura/mobile/gui/components/SpriteLabel.java
SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/gui/layout/GridLayout.java
SwingME/src/net/yura/mobile/gui/layout/Layout.java
SwingME/src/net/yura/mobile/test/MainPane.java
SwingME/src/net/yura/mobile/test/MyMidlet.java
SwingME/src/net/yura/mobile/test/SimpleMidlet.java
Added Paths:
-----------
SwingME/src/net/yura/mobile/gui/components/ComboBox.java
Removed Paths:
-------------
SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java
Modified: SwingME/src/net/yura/mobile/gui/ActionListener.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/ActionListener.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/ActionListener.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,7 +1,32 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui;
+/**
+ * @author Yura Mamyrin
+ * @see java.awt.event.ActionListener
+ */
public interface ActionListener {
+ /**
+ * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) ActionListener.actionPerformed
+ * @param actionCommand The Command of the action
+ */
void actionPerformed(String actionCommand);
}
Modified: SwingME/src/net/yura/mobile/gui/ChangeListener.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/ChangeListener.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/ChangeListener.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,7 +1,24 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui;
/**
- * @author ymamyrin
+ * @author Yura Mamyrin
*/
public interface ChangeListener {
Modified: SwingME/src/net/yura/mobile/gui/CommandButton.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/CommandButton.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/CommandButton.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui;
import javax.microedition.lcdui.Command;
@@ -2,2 +19,5 @@
+/**
+ * @author Yura Mamyrin
+ */
public class CommandButton extends Command {
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -226,7 +226,7 @@
*/
public void paint(Graphics g) {
- System.out.println("CANVAS PAINT!!! fullrepaint="+fullrepaint+" repaintComponent="+repaintComponent);
+ //System.out.println("CANVAS PAINT!!! fullrepaint="+fullrepaint+" repaintComponent="+repaintComponent);
if (!paintdone) {
Modified: SwingME/src/net/yura/mobile/gui/KeyEvent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/KeyEvent.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/KeyEvent.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui;
import javax.microedition.lcdui.Canvas;
@@ -2,2 +19,6 @@
+/**
+ * @author Yura Mamyrin
+ * @see java.awt.event.KeyEvent
+ */
public class KeyEvent {
Modified: SwingME/src/net/yura/mobile/gui/Midlet.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Midlet.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/Midlet.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui;
import javax.microedition.lcdui.Display;
@@ -4,6 +21,9 @@
import javax.microedition.lcdui.Displayable;
import javax.microedition.midlet.MIDlet;
+/**
+ * @author Yura Mamyrin
+ */
public abstract class Midlet extends MIDlet {
private DesktopPane rootpane;
Modified: SwingME/src/net/yura/mobile/gui/border/Border.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/Border.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/border/Border.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.border;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/border/CompoundBorder.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.border;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.border;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/gui/border/LineBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/LineBorder.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/border/LineBorder.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.border;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.border;
import java.io.IOException;
Modified: SwingME/src/net/yura/mobile/gui/border/TabBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/TabBorder.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/border/TabBorder.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.border;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,9 +1,23 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.cellrenderer;
import javax.microedition.lcdui.Graphics;
-
-import net.yura.mobile.gui.Font;
-import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.border.EmptyBorder;
import net.yura.mobile.gui.border.LineBorder;
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultTabRenderer.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.cellrenderer;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.cellrenderer;
import net.yura.mobile.gui.components.Component;
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -171,7 +171,7 @@
public void focusLost() {
super.focusLost();
- setBorder(normalBorder);
+ super.setBorder(normalBorder);
setForegroundByFontColorIndex(0);
if (useSelectButton) {
@@ -183,7 +183,7 @@
public void focusGained() {
super.focusGained();
- setBorder(activeBorder);
+ super.setBorder(activeBorder);
setForegroundByFontColorIndex(1);
if (useSelectButton) {
Modified: SwingME/src/net/yura/mobile/gui/components/CheckBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/CheckBox.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Graphics;
@@ -4,6 +21,10 @@
import javax.microedition.lcdui.Image;
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JCheckBox
+ */
public class CheckBox extends RadioButton {
private boolean oldState;
Added: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java (rev 0)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -0,0 +1,230 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.yura.mobile.gui.components;
+
+import java.util.Vector;
+import javax.microedition.lcdui.Graphics;
+import javax.microedition.lcdui.Image;
+import net.yura.mobile.gui.ActionListener;
+import net.yura.mobile.gui.CommandButton;
+import net.yura.mobile.gui.cellrenderer.DefaultListCellRenderer;
+import net.yura.mobile.util.Option;
+
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JComboBox
+ */
+public class ComboBox extends Button implements ActionListener{
+
+ private Image selectedImage;
+ private Image nonSelectedImage;
+
+// private Vector items;
+ private List list;
+ private ScrollPane scroll;
+
+ private CommandButton[] pbuttons;
+
+ public ComboBox() {
+
+ }
+
+ public ComboBox(Vector vec){
+ this();
+
+ setItems(vec);
+ }
+
+
+ public void doLayout() {
+ if (list!=null) {
+
+ Vector items = list.getItems();
+
+ if (items != null){
+ int count = 0;
+ int hi = 0;
+
+ for (int i = 0; i < items.size(); i ++){
+
+ Object obj = items.elementAt(i);
+
+ int lenW = getCombinedWidth(String.valueOf(obj),(obj instanceof Option)?((Option)obj).getIcon():null);
+ int lenH = getCombinedHeight((obj instanceof Option)?((Option)obj).getIcon():null);
+
+
+ if (count < lenW){
+ count = lenW;
+ }
+ if (hi < lenH){
+ hi = lenH;
+ }
+
+ }
+
+ width = count + padding*2 + ((nonSelectedImage == null)?hi:nonSelectedImage.getWidth());
+ height = hi + padding*2;
+ }
+
+ int h = height * getItems().size();
+ if(h > height * 4){
+ h = height *4;
+ }
+ scroll.setSize(width, h);
+ scroll.doLayout();
+ }
+ }
+
+ public void fireActionPerformed() {
+
+ createList();
+
+ int y;
+
+ if ((getYInWindow() + height + scroll.getHeight()) > owner.getHeight()){
+ y = getYInWindow() - scroll.getHeight();
+ } else{
+ y = getYInWindow() + height;
+ }
+
+ scroll.setPosition(getXInWindow(), y);
+ owner.setGlassPaneComponent(scroll);
+
+ pbuttons = new CommandButton[2];
+ pbuttons[0]=owner.getWindowCommands()[0];
+ pbuttons[1]=owner.getWindowCommands()[1];
+ owner.setWindowCommand(0, null);
+ owner.setWindowCommand(1, null);
+
+ owner.repaint();
+
+ }
+
+ private void createList() {
+ if (list==null) {
+ list = new List( new DefaultListCellRenderer());
+ list.setBackground(background);
+ list.addActionListener(this);
+ scroll = new ScrollPane(list);
+ scroll.setTransparent(false);
+ scroll.setBorder(activeBorder);
+
+ }
+
+ }
+
+ public void paintComponent(Graphics g){
+
+ if (nonSelectedImage == null){
+
+ int w = width - height + padding*2;
+ g.setColor( getBorderColor() );
+ g.drawLine(w , 0, w , height);
+
+ int gp = 2; // gap between arrow and sides
+ ScrollPane.drawDownArrow(g, w+1+gp, (height/2)-2, width-w-gp*2-1, height);
+ }
+ else {
+
+ g.drawImage((isFocused())?selectedImage:nonSelectedImage, width-nonSelectedImage.getWidth(), (height-nonSelectedImage.getHeight())/2 , 0 );
+ }
+
+ super.paintComponent(g);
+ }
+
+ public Image getSelectedImage() {
+ return selectedImage;
+ }
+
+ public void setSelectedImage(Image selectedImage) {
+ this.selectedImage = selectedImage;
+ }
+
+ public Image getNonSelectedImage() {
+ return nonSelectedImage;
+ }
+
+ public void setNonSelectedImage(Image nonSelectedImage) {
+ this.nonSelectedImage = nonSelectedImage;
+ }
+
+ public Vector getItems() {
+ return list.getItems();
+ }
+
+ public void setItems(Vector items) {
+ createList();
+ list.setListData(items);
+
+ if (items.size()>0) {
+ setSelectedIndex(0);
+ }
+ else {
+ super.setText("");
+ }
+
+ }
+
+ public void actionPerformed(String actionCommand) {
+
+ setValue( list.getFocusedItem() );
+
+ owner.setGlassPaneComponent(null);
+ owner.setWindowCommand(0, pbuttons[0]);
+ owner.setWindowCommand(1, pbuttons[1]);
+ pbuttons=null;
+
+ super.fireActionPerformed();
+
+ repaint();
+ }
+
+ public Object getSelected() {
+ createList();
+ return list.getFocusedItem();
+ }
+
+ public void setSelected(Object selected) {
+ createList();
+ list.setFocusedItem(selected);
+ super.setText(selected.toString());
+
+ }
+
+ public void setSelectedIndex(int i) {
+ setSelected( list.getItems().elementAt(i) );
+ }
+
+
+ public int getFocusedItemIndex(){
+ return list.getFocusedItemIndex();
+ }
+
+ /**
+ * This throws an IllegalArgumentException and you should use the
+ * setIndex method instead
+ */
+ public void setText(String a) {
+ throw new IllegalArgumentException();
+ }
+
+ public void setScrollMode(int m) {
+ createList();
+ scroll.setMode(m);
+ }
+}
\ No newline at end of file
Property changes on: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
___________________________________________________________________
Name: svn:executable
+ *
Deleted: SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,212 +0,0 @@
-package net.yura.mobile.gui.components;
-
-import java.util.Vector;
-
-import javax.microedition.lcdui.Graphics;
-import javax.microedition.lcdui.Image;
-
-import net.yura.mobile.gui.ActionListener;
-import net.yura.mobile.gui.CommandButton;
-import net.yura.mobile.gui.cellrenderer.DefaultListCellRenderer;
-import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.util.Option;
-
-public class DropDownMenu extends Button implements ActionListener{
-
- private Image selectedImage;
- private Image nonSelectedImage;
-
-// private Vector items;
- private List list;
- private ScrollPane scroll;
-
- private CommandButton[] pbuttons;
-
- public DropDownMenu() {
-
- }
-
- public DropDownMenu(Vector vec){
- this();
-
- setItems(vec);
- }
-
-
- public void doLayout() {
- if (list!=null) {
-
- Vector items = list.getItems();
-
- if (items != null){
- int count = 0;
- int hi = 0;
-
- for (int i = 0; i < items.size(); i ++){
-
- Object obj = items.elementAt(i);
-
- int lenW = getCombinedWidth(String.valueOf(obj),(obj instanceof Option)?((Option)obj).getIcon():null);
- int lenH = getCombinedHeight((obj instanceof Option)?((Option)obj).getIcon():null);
-
-
- if (count < lenW){
- count = lenW;
- }
- if (hi < lenH){
- hi = lenH;
- }
-
- }
-
- width = count + padding*2 + ((nonSelectedImage == null)?hi:nonSelectedImage.getWidth());
- height = hi + padding*2;
- }
-
- int h = height * getItems().size();
- if(h > height * 4){
- h = height *4;
- }
- scroll.setSize(width, h);
- scroll.doLayout();
- }
- }
-
- public void fireActionPerformed() {
-
- createList();
-
- int y;
-
- if ((getYInWindow() + height + scroll.getHeight()) > owner.getHeight()){
- y = getYInWindow() - scroll.getHeight();
- } else{
- y = getYInWindow() + height;
- }
-
- scroll.setPosition(getXInWindow(), y);
- owner.setGlassPaneComponent(scroll);
-
- pbuttons = new CommandButton[2];
- pbuttons[0]=owner.getWindowCommands()[0];
- pbuttons[1]=owner.getWindowCommands()[1];
- owner.setWindowCommand(0, null);
- owner.setWindowCommand(1, null);
-
- owner.repaint();
-
- }
-
- private void createList() {
- if (list==null) {
- list = new List( new DefaultListCellRenderer());
- list.setBackground(background);
- list.addActionListener(this);
- scroll = new ScrollPane(list);
- scroll.setTransparent(false);
- scroll.setBorder(activeBorder);
-
- }
-
- }
-
- public void paintComponent(Graphics g){
-
- if (nonSelectedImage == null){
-
- int w = width - height + padding*2;
- g.setColor( getBorderColor() );
- g.drawLine(w , 0, w , height);
-
- int gp = 2; // gap between arrow and sides
- ScrollPane.drawDownArrow(g, w+1+gp, (height/2)-2, width-w-gp*2-1, height);
- }
- else {
-
- g.drawImage((isFocused())?selectedImage:nonSelectedImage, width-nonSelectedImage.getWidth(), (height-nonSelectedImage.getHeight())/2 , 0 );
- }
-
- super.paintComponent(g);
- }
-
- public Image getSelectedImage() {
- return selectedImage;
- }
-
- public void setSelectedImage(Image selectedImage) {
- this.selectedImage = selectedImage;
- }
-
- public Image getNonSelectedImage() {
- return nonSelectedImage;
- }
-
- public void setNonSelectedImage(Image nonSelectedImage) {
- this.nonSelectedImage = nonSelectedImage;
- }
-
- public Vector getItems() {
- return list.getItems();
- }
-
- public void setItems(Vector items) {
- createList();
- list.setListData(items);
-
- if (items.size()>0) {
- setSelectedIndex(0);
- }
- else {
- super.setText("");
- }
-
- }
-
- public void actionPerformed(String actionCommand) {
-
- setValue( list.getFocusedItem() );
-
- owner.setGlassPaneComponent(null);
- owner.setWindowCommand(0, pbuttons[0]);
- owner.setWindowCommand(1, pbuttons[1]);
- pbuttons=null;
-
- super.fireActionPerformed();
-
- repaint();
- }
-
- public Object getSelected() {
- createList();
- return list.getFocusedItem();
- }
-
- public void setSelected(Object selected) {
- createList();
- list.setFocusedItem(selected);
- super.setText(selected.toString());
-
- }
-
- public void setSelectedIndex(int i) {
- setSelected( list.getItems().elementAt(i) );
- }
-
-
- public int getFocusedItemIndex(){
- return list.getFocusedItemIndex();
- }
-
- /**
- * This throws an IllegalArgumentException and you should use the
- * setIndex method instead
- */
- public void setText(String a) {
- throw new IllegalArgumentException();
- }
-
- public void setScrollMode(int m) {
- createList();
- scroll.setMode(m);
- }
-}
\ No newline at end of file
Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Graphics;
Modified: SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import java.util.Vector;
Modified: SwingME/src/net/yura/mobile/gui/components/ProgressBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ProgressBar.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/ProgressBar.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Graphics;
@@ -3,4 +20,8 @@
import net.yura.mobile.gui.DesktopPane;
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JProgressBar
+ */
public class ProgressBar extends Component {
Modified: SwingME/src/net/yura/mobile/gui/components/RadioButton.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/RadioButton.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Graphics;
@@ -3,4 +20,8 @@
import javax.microedition.lcdui.Image;
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JRadioButton
+ */
public class RadioButton extends Button {
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -25,7 +25,6 @@
* @author Yura Mamyrin
* @see javax.swing.JScrollPane
*/
-
public class ScrollPane extends Panel {
public static final int MODE_NONE=-1;
Modified: SwingME/src/net/yura/mobile/gui/components/SpriteLabel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/SpriteLabel.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/SpriteLabel.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Graphics;
@@ -3,4 +20,7 @@
import javax.microedition.lcdui.game.Sprite;
+/**
+ * @author Yura Mamyrin
+ */
public class SpriteLabel extends ProgressBar {
Modified: SwingME/src/net/yura/mobile/gui/components/TabbedPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/TabbedPane.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import java.util.Vector;
@@ -14,7 +31,8 @@
import net.yura.mobile.util.Option;
/**
- * @author ymamyrin
+ * @author Yura Mamyrin
+ * @see javax.swing.JTabbedPane
*/
public class TabbedPane extends Panel implements ChangeListener {
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import java.util.Vector;
@@ -12,6 +29,10 @@
import net.yura.mobile.gui.layout.BorderLayout;
import net.yura.mobile.gui.layout.GridLayout;
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JFrame
+ */
public class Window extends Component implements ActionListener {
private Panel contentPane;
Modified: SwingME/src/net/yura/mobile/gui/layout/GridLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/GridLayout.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/layout/GridLayout.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.layout;
import java.util.Hashtable;
Modified: SwingME/src/net/yura/mobile/gui/layout/Layout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/Layout.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/gui/layout/Layout.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.layout;
import java.util.Hashtable;
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -33,7 +33,7 @@
import net.yura.mobile.gui.components.Button;
import net.yura.mobile.gui.components.CheckBox;
import net.yura.mobile.gui.components.Component;
-import net.yura.mobile.gui.components.DropDownMenu;
+import net.yura.mobile.gui.components.ComboBox;
import net.yura.mobile.gui.components.Label;
import net.yura.mobile.gui.components.List;
import net.yura.mobile.gui.components.MultilineLabel;
@@ -226,7 +226,7 @@
items.addElement(new Option("3","Three option"));
items.addElement(new Option("4",null,image));
- componentTest.add( new DropDownMenu(items) );
+ componentTest.add( new ComboBox(items) );
componentTest.add( new Spinner(items, false));
componentTest.add( new TextField(javax.microedition.lcdui.TextField.NUMERIC) );
Modified: SwingME/src/net/yura/mobile/test/MyMidlet.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MyMidlet.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/test/MyMidlet.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.test;
import net.yura.mobile.gui.Midlet;
Modified: SwingME/src/net/yura/mobile/test/SimpleMidlet.java
===================================================================
--- SwingME/src/net/yura/mobile/test/SimpleMidlet.java 2008-07-09 11:44:48 UTC (rev 21)
+++ SwingME/src/net/yura/mobile/test/SimpleMidlet.java 2008-07-09 12:15:22 UTC (rev 22)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.test;
import net.yura.mobile.gui.ActionListener;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-09 11:44:50
|
Revision: 21
http://swingme.svn.sourceforge.net/swingme/?rev=21&view=rev
Author: yuranet
Date: 2008-07-09 04:44:48 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
better scrolling
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/Theme.java
SwingME/src/net/yura/mobile/gui/components/Button.java
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/Panel.java
SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
SwingME/src/net/yura/mobile/gui/components/Spinner.java
SwingME/src/net/yura/mobile/gui/components/TextField.java
SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java
SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java
SwingME/src/net/yura/mobile/test/MainPane.java
Added Paths:
-----------
SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui;
import java.util.Vector;
@@ -209,7 +226,7 @@
*/
public void paint(Graphics g) {
- //System.out.println("ROOTPANE RENDER!! STARTING PAINT!!");
+ System.out.println("CANVAS PAINT!!! fullrepaint="+fullrepaint+" repaintComponent="+repaintComponent);
if (!paintdone) {
@@ -377,8 +394,7 @@
focusedComponent = ac;
if (focusedComponent != null) {
-
- focusedComponent.focusGained();
+ focusedComponent.focusGained();
}
}
Modified: SwingME/src/net/yura/mobile/gui/Theme.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui;
import net.yura.mobile.gui.border.Border;
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Canvas;
@@ -153,8 +170,8 @@
}
public void focusLost() {
-
- super.setBorder(normalBorder);
+ super.focusLost();
+ setBorder(normalBorder);
setForegroundByFontColorIndex(0);
if (useSelectButton) {
@@ -165,8 +182,8 @@
}
public void focusGained() {
-
- super.setBorder(activeBorder);
+ super.focusGained();
+ setBorder(activeBorder);
setForegroundByFontColorIndex(1);
if (useSelectButton) {
@@ -206,5 +223,7 @@
}
return 0;
}
-
+ public String toString() {
+ return super.toString() +"("+ getText()+")";
+ }
}
\ No newline at end of file
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Canvas;
@@ -126,7 +143,17 @@
public void focusLost() { }
- public void focusGained() { }
+ public void focusGained() {
+
+ // default focusGained action, make me visible
+ scrollRectToVisible(
+ (border!=null)?border.getLeft():0,
+ (border!=null)?border.getTop():0,
+ getWidthWithBorder(),
+ getHeightWithBorder(),
+ false);
+
+ }
public void doLayout() { }
@@ -337,13 +364,15 @@
scroller = s;
}
- // override this to NOT to scroll, or to scroll to the label, etc
- public boolean scrollTo(Component newone) {
-
- return scrollRectToVisible( newone.getXWithBorder(),newone.getYWithBorder(),newone.getWidthWithBorder(),newone.getHeightWithBorder() , true);
- }
-
- // if smart was on, returns true if the scroll did reach its destination
+ /**
+ * @param a X position inside CURRENT component
+ * @param b Y position inside CURRENT component
+ * @param c Width of area inside CURRENT component
+ * @param d Height of area inside CURRENT component
+ * @param smart use smart scroll, if true and the component is too far it will only scroll a bit and not all the way
+ * @return if smart was on, returns true if the scroll did reach its destination
+ * @see javax.swing.JComponent#scrollRectToVisible(java.awt.Rectangle) JComponent.scrollRectToVisible
+ */
public boolean scrollRectToVisible(int a,int b,int c,int d,boolean smart) {
if (scroller!=null) {
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import java.util.Vector;
@@ -12,6 +29,10 @@
import net.yura.mobile.gui.cellrenderer.ListCellRenderer;
import net.yura.mobile.gui.KeyEvent;
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JList
+ */
public class List extends Component implements ActionListener {
private static CommandButton selectButton = new CommandButton("Select","select");
@@ -208,7 +229,7 @@
}
public void focusLost() {
-
+ super.focusLost();
if (useSelectButton) {
DesktopPane.getDesktopPane().setComponentCommand(0, null);
}
@@ -216,19 +237,19 @@
}
- public void focusGained() {
-
- if (items.size() != 0 ) {
- if (current==-1) { current=0; }
- setFocusedItemIndex(current);
- }
-
- if (useSelectButton) {
- DesktopPane.getDesktopPane().setComponentCommand(0, selectButton);
- }
-
- }
+ public void focusGained() {
+ super.focusGained();
+ if (items.size() != 0 ) {
+ if (current==-1) { current=0; }
+ setFocusedItemIndex(current);
+ }
+ if (useSelectButton) {
+ DesktopPane.getDesktopPane().setComponentCommand(0, selectButton);
+ }
+
+ }
+
public boolean keyEvent(KeyEvent keypad) {
@@ -373,6 +394,7 @@
// THIS WILL NOT WORK if list in inside a panel inside a scrollpane
// as posX and posY will be wrong!
+ // ALSO WILLNOT WORK IN BOXLAYOUT HCENTRE IF NOT THE FIRST COMPONENT
if (horizontal) {
scrollRectToVisible( c.getXWithBorder(), -posY, c.getWidthWithBorder(), 1,false);
}
@@ -387,7 +409,7 @@
// TODO as scroll to always does a repaint
// we dont need it here
// BUT what if we are not in a scrollPane??
- //repaint();
+ repaint();
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import java.util.Hashtable;
@@ -176,11 +193,6 @@
}
- //public void focusGained() {
- //
- // breakOutAction(null,true,false);
- //
- //}
// BREAK OUT!!!
// find next component in this panel
@@ -211,7 +223,7 @@
if (newone.isSelectable()) {
- if ( scrollTo(newone) ) {
+ if ( scrollRectToVisible( newone.getXWithBorder(),newone.getYWithBorder(),newone.getWidthWithBorder(),newone.getHeightWithBorder() , true) ) {
DesktopPane.getDesktopPane().setFocusedComponent(newone);
}
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Graphics;
@@ -6,9 +23,10 @@
/**
* @author Yura Mamyrin
+ * @see javax.swing.JScrollPane
*/
-public class ScrollPane extends Panel { // MScrollableComponent
+public class ScrollPane extends Panel {
public static final int MODE_NONE=-1;
public static final int MODE_SCROLLBARS=0;
@@ -21,10 +39,22 @@
private int scrollTrackCol;
private int scrollBarCol;
+ /**
+ * @see javax.swing.JScrollPane#JScrollPane() JScrollPane.JScrollPane
+ */
public ScrollPane() {
this(MODE_SCROLLBARS);
}
- public ScrollPane(int m) {
+
+ /**
+ * @param view the component to display in the scrollpane's viewport
+ * @see javax.swing.JScrollPane#JScrollPane(java.awt.Component) JScrollPane.JScrollPane
+ */
+ public ScrollPane(Component view) {
+ this(view,MODE_SCROLLBARS);
+ }
+
+ public ScrollPane(int m) {
setMode(m);
@@ -32,13 +62,9 @@
scrollBarCol = DesktopPane.getDefaultTheme().scrollBarCol;
}
- public ScrollPane(Component reguserpanel) {
- this(reguserpanel,MODE_SCROLLBARS);
- }
-
- public ScrollPane(Component reguserpanel,int a) {
+ public ScrollPane(Component view,int a) {
this(a);
- add(reguserpanel);
+ add(view);
}
public void setMode(int m) {
@@ -124,7 +150,11 @@
public boolean makeVisible(int x,int y,int w,int h,boolean smartscroll) {
-
+
+ Component component = getComponent();
+ int oldX = component.getX();
+ int oldY = component.getY();
+
//System.out.println("x="+x+" y="+y+" w="+w+" h="+h);
//System.out.println("viewPortX="+viewPortX+" viewPortY="+viewPortY+" width="+width+" height="+height);
//if(true)throw new RuntimeException();
@@ -134,8 +164,8 @@
- int componentX = -getComponent().getX();
- int componentY = -getComponent().getY();
+ int componentX = -component.getX();
+ int componentY = -component.getY();
int viewX=getViewPortX();
int viewY=getViewPortY();
@@ -161,13 +191,13 @@
}
// check we r not scrolling off the content panel
- if ((viewX+componentX+viewWidth)>getComponent().getWidth()) { componentX=getComponent().getWidth()-viewWidth-viewX; }
- if ((viewY+componentY+viewHeight)>getComponent().getHeight()) { componentY=getComponent().getHeight()-viewHeight-viewY; }
+ if ((viewX+componentX+viewWidth)>component.getWidth()) { componentX=component.getWidth()-viewWidth-viewX; }
+ if ((viewY+componentY+viewHeight)>component.getHeight()) { componentY=component.getHeight()-viewHeight-viewY; }
if (componentX<-viewX) { componentX=-viewX; }
if (componentY<-viewY) { componentY=-viewY; }
- int xdiff=-componentX -getComponent().getX();
- int ydiff=-componentY -getComponent().getY();
+ int xdiff=-componentX -component.getX();
+ int ydiff=-componentY -component.getY();
boolean goodscroll=true;
@@ -190,13 +220,16 @@
}
}
- getComponent().setBounds( getComponent().getX()+xdiff , getComponent().getY()+ydiff , getComponent().getWidth(), getComponent().getHeight());
+ component.setBounds( component.getX()+xdiff , component.getY()+ydiff , component.getWidth(), component.getHeight());
- //getComponent().setBounds(15, 15, getComponent().getWidth(), getComponent().getHeight());
+ //component.setBounds(15, 15, component.getWidth(), component.getHeight());
//System.out.println("new pos: x="+component.getX()+" y="+component.getY() );
- repaint();
+ // only repint if we have moved
+ if (oldX!=component.getX() || oldY!=component.getY()) {
+ repaint();
+ }
return goodscroll;
@@ -274,15 +307,7 @@
}
}
-
- //public void focusGained() {
-
- // owner.setFocusedComponent(component);
- //}
-
- //protected void keyPressEvent(int keyCode, int gameKeyCode, int number) { }
-
public void paintChildren(Graphics g) {
int a=g.getClipX();
@@ -386,9 +411,7 @@
}
private void drawScrollArrows(final Graphics g,boolean indicator) {
-
-
-
+
int viewHeight=getViewPortHeight();
int viewWidth=getViewPortWidth(viewHeight);
Modified: SwingME/src/net/yura/mobile/gui/components/Spinner.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import java.util.Vector;
@@ -235,11 +252,13 @@
}
public void focusLost() {
+ super.focusLost();
setForegroundByFontColorIndex(0);
repaint();
}
public void focusGained() {
+ super.focusGained();
setForegroundByFontColorIndex(1);
repaint();
}
Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Canvas;
@@ -12,9 +29,12 @@
import net.yura.mobile.gui.Font;
import net.yura.mobile.gui.KeyEvent;
import net.yura.mobile.gui.DesktopPane;
-import net.yura.mobile.gui.border.LineBorder;
import net.yura.mobile.gui.border.Border;
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JTextField
+ */
public class TextField extends Component implements ActionListener, CommandListener {
private static TextBox textbox;
@@ -347,7 +367,7 @@
}
public void focusLost() {
-
+ super.focusLost();
setBorder(borderColor);
active = false;
@@ -362,7 +382,7 @@
public void focusGained() {
-
+ super.focusGained();
setBorder(activeBorderColor);
active = true;
Modified: SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/layout/BorderLayout.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.layout;
import java.util.Hashtable;
@@ -7,7 +24,7 @@
import net.yura.mobile.gui.components.Panel;
/**
- * @author ymamyrin
+ * @author Yura Mamyrin
* @see java.awt.BorderLayout
*/
public class BorderLayout implements Layout {
Added: SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java (rev 0)
+++ SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -0,0 +1,91 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.yura.mobile.gui.layout;
+
+import java.util.Hashtable;
+import java.util.Vector;
+import javax.microedition.lcdui.Graphics;
+import net.yura.mobile.gui.components.Component;
+import net.yura.mobile.gui.components.Panel;
+
+/**
+ * @author Yura Mamyrin
+ * @see java.awt.BoxLayout
+ */
+public class BoxLayout implements Layout {
+
+ private int axis;
+
+ /**
+ * @param axis the axis to lay out components along, can be Graphics.VCENTRE or Graphics.HCENTRE
+ * @see javax.swing.BoxLayout#BoxLayout(java.awt.Container, int) BoxLayout.BoxLayout
+ */
+ public BoxLayout(int axis) {
+ this.axis = axis;
+ }
+
+ /**
+ * @see javax.swing.BoxLayout#layoutContainer(java.awt.Container) BoxLayout.layoutContainer
+ */
+ public void layoutPanel(Panel panel, Hashtable cons) {
+
+ int width = 0;
+ int height = 0;
+
+ Vector components = panel.getComponents();
+
+ for (int c=0;c<components.size();c++) {
+
+ Component comp = (Component)components.elementAt(c);
+
+ if (axis == Graphics.HCENTER) {
+ width = width + comp.getWidthWithBorder();
+ if (height < comp.getHeightWithBorder()) {
+ height = comp.getHeightWithBorder();
+ }
+ }
+ else {
+ height = height + comp.getHeightWithBorder();
+ if (width < comp.getWidthWithBorder()) {
+ width = comp.getWidthWithBorder();
+ }
+ }
+
+ }
+
+ if (height<panel.getHeight()) {
+ height = panel.getHeight();
+ }
+ if (width<panel.getWidth()) {
+ width = panel.getWidth();
+ }
+
+ int offset=0;
+ for (int c=0;c<components.size();c++) {
+
+ Component comp = (Component)components.elementAt(c);
+
+ comp.setBoundsWithBorder((axis==Graphics.HCENTER)?offset:0 , (axis==Graphics.HCENTER)?0:offset, (axis==Graphics.HCENTER)?comp.getWidthWithBorder():width, (axis==Graphics.HCENTER)?height:comp.getHeightWithBorder() );
+ offset = offset + ((axis==Graphics.HCENTER)?comp.getWidthWithBorder():comp.getHeightWithBorder());
+ }
+
+ panel.setSize(width,height);
+
+ }
+
+}
Property changes on: SwingME/src/net/yura/mobile/gui/layout/BoxLayout.java
___________________________________________________________________
Name: svn:executable
+ *
Modified: SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/gui/layout/FlowLayout.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.gui.layout;
import java.util.Hashtable;
Modified: SwingME/src/net/yura/mobile/test/MainPane.java
===================================================================
--- SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-08 15:21:55 UTC (rev 20)
+++ SwingME/src/net/yura/mobile/test/MainPane.java 2008-07-09 11:44:48 UTC (rev 21)
@@ -1,3 +1,20 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.yura.mobile.test;
import java.io.IOException;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-08 15:21:58
|
Revision: 20
http://swingme.svn.sourceforge.net/swingme/?rev=20&view=rev
Author: yuranet
Date: 2008-07-08 08:21:55 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
better borders
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/Font.java
SwingME/src/net/yura/mobile/gui/Theme.java
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
SwingME/src/net/yura/mobile/gui/components/Button.java
SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java
SwingME/src/net/yura/mobile/gui/components/Label.java
SwingME/src/net/yura/mobile/gui/components/Spinner.java
SwingME/src/net/yura/mobile/gui/components/TextField.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -384,8 +384,8 @@
}
public CommandButton[] getCurrentCommands(){
- currentCommands[0] = omponentCommands[0] == null ? currentWindow.panelCmds[0] : omponentCommands[0];
- currentCommands[1] = omponentCommands[1] == null ? currentWindow.panelCmds[1] : omponentCommands[1];
+ currentCommands[0] = omponentCommands[0] == null ? currentWindow.getWindowCommands()[0] : omponentCommands[0];
+ currentCommands[1] = omponentCommands[1] == null ? currentWindow.getWindowCommands()[1] : omponentCommands[1];
return currentCommands;
}
@@ -415,7 +415,7 @@
}
- CommandButton[] panelCmds = currentWindow.getPanelCommands();
+ CommandButton[] panelCmds = currentWindow.getWindowCommands();
ActionListener actionListener = currentWindow.getActionListener();
boolean softkey1Action = keyevent.isDownKey(KeyEvent.KEY_SOFTKEY1) || keyevent.justReleasedKey(KeyEvent.KEY_SOFTKEY1);
Modified: SwingME/src/net/yura/mobile/gui/Font.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Font.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/Font.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -11,33 +11,36 @@
public class Font {
- private int height;
- private int startX[];
- private int startY[];
- private int spaceWidth;
- private byte characterWidth[];
- private Image characterImage;
- private int characterSpacing;
-
+ private int height;
+ private int startX[];
+ private int startY[];
+ private int spaceWidth;
+ private byte characterWidth[];
+ private Image characterImage;
+ private int characterSpacing;
+
private javax.microedition.lcdui.Font systemFont=null;
private int fontColor=0;
private Hashtable imageTable;
private int[] colors;
-
+
private boolean numbermode;
-
-
+
public Font() {
+ this( javax.microedition.lcdui.Font.getDefaultFont() );
+ }
+
+ public Font(javax.microedition.lcdui.Font f) {
- setSystemFont( javax.microedition.lcdui.Font.getDefaultFont() );
+ setSystemFont( f );
// not sure if this is needed
colors = new int[2];
colors[0]=0x00000000;
colors[1]=0x000000FF;
}
-
+
public Font(String name) {
try {
@@ -192,26 +195,14 @@
height = getHeight();
}
- /**
- * Sets the distance in pixels between each character.
- * This is used when a string is rendered, between each adjacent pair of non-space characters a spacing gap is inserted.
- * This gap may be negative in order to overlap the character images. Be careful when changing this value as it affects
- * the width of strings and subsequently any alignment applied to them when rendered.
- * @param spacing The size in pixels of the gap between non-space characters (can be negative if desired).
- */
- public void setCharacterSpacing(int spacing)
+
+ public void setCharacterSpacing(int spacing)
{
characterSpacing = spacing;
}
- /**
- * Sets the size of a space character.
- * A space character is defined as any character with a width of zero. The default value for the space width in a newly
- * created font is the same width as that font's lower case 'o' character, so make sure this value is set for fonts
- * that do not contain a lowe case 'o'.
- * @param width The width of the space character.
- */
- public void setSpaceWidth(int width)
+
+ public void setSpaceWidth(int width)
{
spaceWidth = width;
}
@@ -219,8 +210,8 @@
/**
* Gets the width of a single character using this font.
* This will return the space width for any zero-width characters as these characters are treated as spaces.
- * @param c The character to get the width of.
- * @return The width of the requested character when rendered using this font.
+ * @param c The character to get the width of.
+ * @return The width of the requested character when rendered using this font.
*/
public int getWidth(char c) {
@@ -290,15 +281,7 @@
}
- /**
- * Gets the height of the font.
- * The height of the font is defined by the character data image. It may not always be the height of the tallest
- * character in the font, but should be the difference between the top of the character that stretches the highest
- * above the baseline and the bottom of the one that reaches the lowest below it.
- * @return The height of the font in pixels.
- */
- public int getHeight()
- {
+ public int getHeight() {
if(systemFont != null)
{
return systemFont.getHeight();
@@ -307,12 +290,6 @@
return height;
}
- /**
- * Gets the width in pixels of a string rendered using this font.
- * Be careful if you change the space width or the character spacing of the font as this will affect all string widths,
- * so if you need to store string widths, make sure you update those stored values after changing the display properties.
- * @return The width of the string in pixels when rendered using this font.
- */
public int getWidth(String s) {
if (numbermode) {
@@ -375,26 +352,19 @@
* Returns system font object, null if system font object is null and bitmap fonts being used.
* @return - javax.microedition.lcdui.Font or null if bitmap fonts used.
*/
- public javax.microedition.lcdui.Font getFont()
- {
+ public javax.microedition.lcdui.Font getFont() {
return systemFont;
}
- /**
+ /**
* Renders a string onto a graphics object.
* This will draw the specified string onto the specified graphics object using this font at the requested position and alignment.
* @param g The graphics object to draw onto.
* @param s The string to draw.
* @param x The x position in the graphics object.
* @param y The y position in the graphics object.
- * @param alignment The alignment to use. This can be one of TOP, MIDDLE, BOTTOM (vertical alignments), LEFT, CENTER, RIGHT
- * (horizontal alignments) or one of the combined flags TOP_LEFT, TOP_CENTER, TOP_RIGHT, etc. The combined values are the
- * same as bitwise or'ing together a vertical alignment value with a horizontal alignment value and are provided for
- * convenience and readability of your code. The default vertical alignment is TOP and the default horizontal alignment is LEFT.
- * The alignment will align the specified 'handle' of the string to the x, y position, so for example if you specify MIDDLE_RIGHT
- * then the string will be rendered such that the x, y position is at the middle right of the string, i.e. the entire string will
- * to the left of the point with half of the string above and half below the point.
- */
+ * @param alignment The alignment to use.
+ */
public int drawString(Graphics g, String s, int x, int y, int alignment) {
setColor( g.getColor() );
Modified: SwingME/src/net/yura/mobile/gui/Theme.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/Theme.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -1,5 +1,8 @@
package net.yura.mobile.gui;
+import net.yura.mobile.gui.border.Border;
+import net.yura.mobile.gui.border.LineBorder;
+
public class Theme {
public int scrollBarCol=0x00FFFFFF;
@@ -12,8 +15,8 @@
public int background;
public int foreground;
- public int itemBorderColor;
- public int itemActiveBorderColor;
+ public Border normalBorder;
+ public Border activeBorder;
public int defaultWidth;
public int defaultSpace;
@@ -34,8 +37,8 @@
background = 0x00FFFFFF;
foreground = 0;
- itemBorderColor = 0x00808080;
- itemActiveBorderColor = 0;
+ normalBorder = new LineBorder(0x00808080);
+ activeBorder = new LineBorder(0);
}
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -26,20 +26,15 @@
*/
public DefaultListCellRenderer() {
- this(
- DesktopPane.getDefaultTheme().font,
- DesktopPane.getDefaultTheme().itemBorderColor,
- DesktopPane.getDefaultTheme().itemActiveBorderColor);
+ this(0x00808080,0);
}
- public DefaultListCellRenderer(Font s,int color,int c2) {
-
- super("",s);
-
+ public DefaultListCellRenderer(int backColor,int borderColor) {
+
normal = new EmptyBorder(1,1,1,1);
- selected = new LineBorder(c2,-1,1,false,Graphics.DOTTED);
+ selected = new LineBorder(borderColor,-1,1,false,Graphics.DOTTED);
setBorder(normal);
- this.color=color;
+ this.color=backColor;
}
/**
* @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) DefaultListCellRenderer.getListCellRendererComponent
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -1,15 +1,19 @@
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Canvas;
+import javax.microedition.lcdui.Image;
import net.yura.mobile.gui.ActionListener;
import net.yura.mobile.util.ButtonGroup;
import net.yura.mobile.gui.CommandButton;
-import net.yura.mobile.gui.Font;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.border.LineBorder;
import net.yura.mobile.gui.KeyEvent;
import net.yura.mobile.gui.border.Border;
+/**
+ * @author Yura Mamyrin
+ * @see javax.swing.JButton
+ */
public class Button extends Label implements ActionListener {
private static CommandButton selectButton = new CommandButton("Select","select");
@@ -31,34 +35,47 @@
private boolean useSelectButton;
- public Button(){
+ /**
+ * @see javax.swing.JButton#JButton() JButton.JButton
+ */
+ public Button() {
this(null);
}
+
+ /**
+ * @param label the text of the button
+ * @see javax.swing.JButton#JButton(java.lang.String) JButton.JButton
+ */
public Button(String label) {
- this(label,
- DesktopPane.getDefaultTheme().font,
- DesktopPane.getDefaultTheme().background,
- DesktopPane.getDefaultTheme().itemBorderColor,
- DesktopPane.getDefaultTheme().itemActiveBorderColor);
+ this(label,null);
}
- public Button(String label, Font font) {
+ /**
+ * @param label the text of the button
+ * @param img the Icon image to display on the button
+ * @see javax.swing.JButton#JButton(java.lang.String, javax.swing.Icon) JButton.JButton
+ */
+ public Button(String label, Image img) {
- this(label,font,0x00FFFFFF,0x00000000,0);
+ this(label,img,
+ DesktopPane.getDefaultTheme().background,
+ DesktopPane.getDefaultTheme().normalBorder,
+ DesktopPane.getDefaultTheme().activeBorder
+ );
}
// full constructor
- public Button(String label, Font font,int a,int b,int c) {
- super(label, font);
+ public Button(String label, Image img,int a,Border b,Border c) {
+ super(label, img);
background = a;
transparent = false;
- setBorder(new LineBorder(b));
- setActiveBorder(new LineBorder(c));
+ setBorder(b);
+ setActiveBorder(c);
selectable = true;
setForegroundByFontColorIndex(0);
Modified: SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/components/DropDownMenu.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -88,8 +88,8 @@
owner.setGlassPaneComponent(scroll);
pbuttons = new CommandButton[2];
- pbuttons[0]=owner.getPanelCommands()[0];
- pbuttons[1]=owner.getPanelCommands()[1];
+ pbuttons[0]=owner.getWindowCommands()[0];
+ pbuttons[1]=owner.getWindowCommands()[1];
owner.setWindowCommand(0, null);
owner.setWindowCommand(1, null);
Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -41,7 +41,7 @@
*/
public Label(String text) {
- this(text,DesktopPane.getDefaultTheme().font);
+ this(text,null);
}
@@ -65,12 +65,6 @@
this(text,DesktopPane.getDefaultTheme().font,icon);
}
-
- public Label(String text,Font f) {
-
- this(text,f,null);
-
- }
public Label(String text,Font f,Image icon) {
@@ -365,7 +359,9 @@
return DesktopPane.getDefaultTheme().defaultWidth;
}
-
+ /**
+ * @deprecated
+ */
public void setForegroundByFontColorIndex(int a) {
if (a < font.getColors().length ) {
Modified: SwingME/src/net/yura/mobile/gui/components/Spinner.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/components/Spinner.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -8,11 +8,10 @@
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.KeyEvent;
+import net.yura.mobile.gui.border.Border;
import net.yura.mobile.util.Option;
public class Spinner extends Label {
-
- private static final int lineTickness = 1;
private Image selectedImage;
private Image nonSelectedImage;
@@ -21,8 +20,8 @@
private Vector list;
- private int borderColor;
- private int activeBorderColor;
+ private Border borderColor;
+ private Border activeBorderColor;
private boolean continuous = false;
@@ -40,8 +39,8 @@
setForegroundByFontColorIndex(0);
- borderColor = DesktopPane.getDefaultTheme().itemBorderColor;
- activeBorderColor = DesktopPane.getDefaultTheme().itemActiveBorderColor;
+ borderColor = DesktopPane.getDefaultTheme().normalBorder;
+ activeBorderColor = DesktopPane.getDefaultTheme().activeBorder;
selectable = true;
@@ -74,8 +73,8 @@
}
- int w = maxWidth + getArrowWidth()*2 + gap*2 + lineTickness*2 + padding*2;
- int h = maxHeight + lineTickness*2 + padding*2;
+ int w = maxWidth + getArrowWidth()*2 + gap*2 + borderColor.getLeft() + borderColor.getRight() + padding*2;
+ int h = maxHeight + borderColor.getTop() + borderColor.getBottom() + padding*2;
if (w > width) width = w;
if (h > height) height = h;
@@ -142,14 +141,13 @@
int arrowWidth = getArrowWidth();
- if (isFocused()){
- g.setColor(activeBorderColor);
- }
- else{
- g.setColor(borderColor);
- }
- g.drawRect(arrowWidth+gap, 0, width -gap*2 - arrowWidth*2 -lineTickness, height-lineTickness);
+ Border b = isFocused()?activeBorderColor:borderColor;
+ g.translate(arrowWidth+gap+borderColor.getLeft(), borderColor.getTop());
+ b.paintBorder(this, g, width -gap*2 - arrowWidth*2 -borderColor.getLeft() - borderColor.getRight(), height-borderColor.getTop() - borderColor.getBottom());
+ g.translate(-arrowWidth-gap-borderColor.getLeft(), -borderColor.getTop());
+
+
if (nonSelectedImage != null) {
// TODO: Finish
@@ -161,18 +159,18 @@
int arrowHeight = getFont().getHeight();
if (leftPress){
- g.setColor(activeBorderColor);
+ g.setColor(0);
}
else{
- g.setColor(borderColor);
+ g.setColor(0x00808080);
}
ScrollPane.drawLeftArrow(g, 0, (height-arrowHeight)/2, arrowWidth, arrowHeight);
if (rightPress){
- g.setColor(activeBorderColor);
+ g.setColor(0);
}
else{
- g.setColor(borderColor);
+ g.setColor(0x00808080);
}
ScrollPane.drawRightArrow(g, width-arrowWidth, (height-arrowHeight)/2, arrowWidth, arrowHeight);
}
@@ -180,18 +178,18 @@
int xoffset = 0;
if (horizontalAlignment==Graphics.LEFT) {
- xoffset = arrowWidth+gap+lineTickness;
+ xoffset = arrowWidth+gap+borderColor.getLeft();
}
else if (horizontalAlignment==Graphics.RIGHT) {
- xoffset = -arrowWidth-gap-lineTickness;
+ xoffset = -arrowWidth-gap-borderColor.getRight();
}
int yoffset=0;
if (verticalAlignment==Graphics.TOP) {
- yoffset = lineTickness;
+ yoffset = borderColor.getTop();
}
else if (verticalAlignment==Graphics.BOTTOM) {
- yoffset = -lineTickness;
+ yoffset = -borderColor.getBottom();
}
g.translate(xoffset, yoffset);
@@ -233,7 +231,7 @@
}
public int getMaxTextWidth() {
- return width - getArrowWidth()*2 - gap*2 - lineTickness*2 - padding*2;
+ return width - getArrowWidth()*2 - gap*2 - borderColor.getLeft() - borderColor.getRight() - padding*2;
}
public void focusLost() {
@@ -246,19 +244,19 @@
repaint();
}
- public int getActiveBorderColor() {
+ public Border getActiveBorder() {
return activeBorderColor;
}
- public void setActiveBorderColor(int activeBorderColor) {
+ public void setActiveBorder(Border activeBorderColor) {
this.activeBorderColor = activeBorderColor;
}
- public int getBorderColor() {
+ public Border getNormalBorder() {
return borderColor;
}
- public void setBorderColor(int borderColor) {
+ public void setNormalBorderColor(Border borderColor) {
this.borderColor = borderColor;
}
Modified: SwingME/src/net/yura/mobile/gui/components/TextField.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/components/TextField.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -13,6 +13,7 @@
import net.yura.mobile.gui.KeyEvent;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.border.LineBorder;
+import net.yura.mobile.gui.border.Border;
public class TextField extends Component implements ActionListener, CommandListener {
@@ -41,8 +42,8 @@
private String label;
private int mode;
- private int borderColor;
- private int activeBorderColor;
+ private Border borderColor;
+ private Border activeBorderColor;
private int activeTextColor;
private StringBuffer text;
@@ -79,10 +80,10 @@
setBackground(DesktopPane.getDefaultTheme().background);
setForeground(DesktopPane.getDefaultTheme().foreground);
- borderColor = DesktopPane.getDefaultTheme().itemBorderColor;
- activeBorderColor = DesktopPane.getDefaultTheme().itemActiveBorderColor;
+ borderColor = DesktopPane.getDefaultTheme().normalBorder;
+ activeBorderColor = DesktopPane.getDefaultTheme().activeBorder;
- setBorder(new LineBorder(borderColor));
+ setBorder(borderColor);
if (font.getColors().length >1) {
activeTextColor = font.getColors()[1];
@@ -347,10 +348,7 @@
public void focusLost() {
- if (border instanceof LineBorder) {
-
- ((LineBorder)border).setLineColor(borderColor);
- }
+ setBorder(borderColor);
active = false;
showCaret = false;
@@ -365,10 +363,7 @@
public void focusGained() {
- if (border instanceof LineBorder) {
-
- ((LineBorder)border).setLineColor(activeBorderColor);
- }
+ setBorder(activeBorderColor);
active = true;
showCaret = true;
@@ -419,10 +414,6 @@
mode = m;
}
- public void setBorderColor(int color) {
- borderColor = color;
- }
-
public int getLength() {
return text.length();
}
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-07 18:22:04 UTC (rev 19)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-08 15:21:55 UTC (rev 20)
@@ -17,6 +17,7 @@
private Panel contentPane;
private Panel glasspanecomponent;
+ private CommandButton[] panelCmds;
private ActionListener actionListener;
public ActionListener getActionListener() {
@@ -304,17 +305,13 @@
public void paintComponent(Graphics g) { }
-
-
- public CommandButton[] panelCmds;
+ public CommandButton[] getWindowCommands() {
+ return panelCmds;
+ }
- public CommandButton[] getPanelCommands(){
- return panelCmds;
- }
-
- /**
- * @see DesktopPane#setComponentCommand
- */
+ /**
+ * @see DesktopPane#setComponentCommand
+ */
public void setWindowCommand(int i, CommandButton softkey) {
panelCmds[i] = softkey;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2008-07-07 18:22:10
|
Revision: 19
http://swingme.svn.sourceforge.net/swingme/?rev=19&view=rev
Author: yuranet
Date: 2008-07-07 11:22:04 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
more javadoc
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/Font.java
SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java
SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/util/Properties.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-07 17:13:34 UTC (rev 18)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2008-07-07 18:22:04 UTC (rev 19)
@@ -389,11 +389,14 @@
return currentCommands;
}
+ /**
+ * @see Window#setWindowCommand
+ */
public void setComponentCommand(int i, CommandButton softkey) {
omponentCommands[i] = softkey;
repaint();
- // TODO: is this correct, will ANY repaint do?
+ // TODO: is this correct, will ANY repaint do? (also in another place)
}
Modified: SwingME/src/net/yura/mobile/gui/Font.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Font.java 2008-07-07 17:13:34 UTC (rev 18)
+++ SwingME/src/net/yura/mobile/gui/Font.java 2008-07-07 18:22:04 UTC (rev 19)
@@ -395,8 +395,7 @@
* then the string will be rendered such that the x, y position is at the middle right of the string, i.e. the entire string will
* to the left of the point with half of the string above and half below the point.
*/
- public int drawString(Graphics g, String s, int x, int y, int alignment)
- {
+ public int drawString(Graphics g, String s, int x, int y, int alignment) {
setColor( g.getColor() );
@@ -539,7 +538,7 @@
private int renderNumber(Graphics g, int x, int y, int number, int digits) {
- int column, digit, startX = x;
+ int column, digit, sX = x;
for(digit = 0, column = 1; digit < digits; digit++)
{
@@ -565,7 +564,7 @@
x = drawDigit(g,x,y,digit);
}
- return x - startX - characterSpacing;
+ return x - sX - characterSpacing;
}
Modified: SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java 2008-07-07 17:13:34 UTC (rev 18)
+++ SwingME/src/net/yura/mobile/gui/border/EmptyBorder.java 2008-07-07 18:22:04 UTC (rev 19)
@@ -37,7 +37,7 @@
}
/**
- * @return
+ * @return The size of the bottom
* @see javax.swing.border.EmptyBorder#getBorderInsets(java.awt.Component) EmptyBorder.getBorderInsets
*/
public int getBottom() {
@@ -46,7 +46,7 @@
}
/**
- * @return
+ * @return The size of the left
* @see javax.swing.border.EmptyBorder#getBorderInsets(java.awt.Component) EmptyBorder.getBorderInsets
*/
public int getLeft() {
@@ -55,7 +55,7 @@
}
/**
- * @return
+ * @return The size of the right
* @see javax.swing.border.EmptyBorder#getBorderInsets(java.awt.Component) EmptyBorder.getBorderInsets
*/
public int getRight() {
@@ -64,7 +64,7 @@
}
/**
- * @return
+ * @return The size of the top
* @see javax.swing.border.EmptyBorder#getBorderInsets(java.awt.Component) EmptyBorder.getBorderInsets
*/
public int getTop() {
Modified: SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java 2008-07-07 17:13:34 UTC (rev 18)
+++ SwingME/src/net/yura/mobile/gui/components/MultilineLabel.java 2008-07-07 18:22:04 UTC (rev 19)
@@ -5,6 +5,11 @@
import net.yura.mobile.gui.Font;
import net.yura.mobile.gui.DesktopPane;
+/**
+ * a component thats like a read-only TextArea
+ * @author Yura Mamyrin
+ * @see javax.swing.JTextArea
+ */
public class MultilineLabel extends Component {
private String text;
@@ -29,26 +34,23 @@
}
/**
- * Creates a new MStringObject item with the given content.
- * @param text - the text content
- * @param font - preffered font object
- * @param alignment - Alignment of the text, should be one of the alignment from Font class
+ * @param text the text content
+ * @param font preffered font object
+ * @param alignment Alignment of the text, should be one of the alignment from Font class
+ * @param width The Width
*/
- public MultilineLabel(String text, Font f, int alignment,int w) {
+ public MultilineLabel(String text, Font font, int alignment,int width) {
- width = w;
+ this.width = width;
align = alignment;
- font = f;
+ this.font = font;
selectable = false;
foreground = DesktopPane.getDefaultTheme().foreground;
setText(text);
}
/**
- * Renders this item at given y position
- * @param Graphics - the graphics object
- * @param int - Y position
- * @return int - height of the item
+ * @param g The Graphics object
*/
public void paintComponent(Graphics g) {
@@ -117,7 +119,7 @@
/**
* Set's the line spacing
- * @param lineSpacing - spacing between lines
+ * @param lineSpacing spacing between lines
*/
public void setLineSpacing(int lineSpacing) {
this.lineSpacing = lineSpacing;
@@ -125,12 +127,16 @@
/**
* Set's the text
- * @param text
+ * @param txt The text
*/
public void setText(String txt) {
setText(txt,getLines(txt,font,0,width));
}
+ /**
+ * @param a The text to append
+ * @see javax.swing.JTextArea#append(java.lang.String) JTextArea.append
+ */
public void append(String a) {
String newtext = text + a;
@@ -169,10 +175,18 @@
return text;
}
+ /**
+ * @param font The font to use
+ * @see javax.swing.JComponent#setFont(java.awt.Font) JComponent.setFont
+ */
public void setFont(Font font){
this.font = font;
}
+ /**
+ * @return the font
+ * @see java.awt.Component#getFont() Component.getFont
+ */
public Font getFont(){
return font;
}
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-07 17:13:34 UTC (rev 18)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2008-07-07 18:22:04 UTC (rev 19)
@@ -312,10 +312,13 @@
return panelCmds;
}
+ /**
+ * @see DesktopPane#setComponentCommand
+ */
public void setWindowCommand(int i, CommandButton softkey) {
panelCmds[i] = softkey;
- repaint(); // TODO is this correct, will ANY repaint do? also another place
+ repaint(); // TODO is this correct, will ANY repaint do? (also in another place)
}
Modified: SwingME/src/net/yura/mobile/util/Properties.java
===================================================================
--- SwingME/src/net/yura/mobile/util/Properties.java 2008-07-07 17:13:34 UTC (rev 18)
+++ SwingME/src/net/yura/mobile/util/Properties.java 2008-07-07 18:22:04 UTC (rev 19)
@@ -37,13 +37,13 @@
* object that contains a non-<code>String</code> key.
*
* <p>
- * The {@link #load(java.io.Reader) load(Reader)} <tt>/</tt>
- * {@link #store(java.io.Writer, java.lang.String) store(Writer, String)}
+ * The {@link java.util.Properties#load(java.io.Reader) load(Reader)} <tt>/</tt>
+ * {@link java.util.Properties#store(java.io.Writer, java.lang.String) store(Writer, String)}
* methods load and store properties from and to a character based stream
* in a simple line-oriented format specified below.
*
- * The {@link #load(java.io.InputStream) load(InputStream)} <tt>/</tt>
- * {@link #store(java.io.OutputStream, java.lang.String) store(OutputStream, String)}
+ * The {@link java.util.Properties#load(java.io.InputStream) load(InputStream)} <tt>/</tt>
+ * {@link java.util.Properties#store(java.io.OutputStream, java.lang.String) store(OutputStream, String)}
* methods work the same way as the load(Reader)/store(Writer, String) pair, except
* the input/output stream is encoded in ISO 8859-1 character encoding.
* Characters that cannot be directly represented in this encoding can be written using
@@ -52,45 +52,9 @@
* sequence. The native2ascii tool can be used to convert property files to and
* from other character encodings.
*
- * <p> The {@link #loadFromXML(InputStream)} and {@link
- * #storeToXML(OutputStream, String, String)} methods load and store properties
- * in a simple XML format. By default the UTF-8 character encoding is used,
- * however a specific encoding may be specified if required. An XML properties
- * document has the following DOCTYPE declaration:
- *
- * <pre>
- * <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
- * </pre>
- * Note that the system URI (http://java.sun.com/dtd/properties.dtd) is
- * <i>not</i> accessed when exporting or importing properties; it merely
- * serves as a string to uniquely identify the DTD, which is:
- * <pre>
- * <?xml version="1.0" encoding="UTF-8"?>
- *
- * <!-- DTD for properties -->
- *
- * <!ELEMENT properties ( comment?, entry* ) >
- *
- * <!ATTLIST properties version CDATA #FIXED "1.0">
- *
- * <!ELEMENT comment (#PCDATA) >
- *
- * <!ELEMENT entry (#PCDATA) >
- *
- * <!ATTLIST entry key CDATA #REQUIRED>
- * </pre>
- *
- * @see <a href="../../../technotes/tools/solaris/native2ascii.html">native2ascii tool for Solaris</a>
- * @see <a href="../../../technotes/tools/windows/native2ascii.html">native2ascii tool for Windows</a>
- *
- * <p>This class is thread-safe: multiple threads can share a single
- * <tt>Properties</tt> object without the need for external synchronization.
- *
- * @author Arthur van Hoff
- * @author Michael McCloskey
- * @author Xueming Shen
- * @version 1.96, 08/07/06
- * @since JDK1.0
+ * @see <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/solaris/native2ascii.html">native2ascii tool for Solaris</a>
+ * @see <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/native2ascii.html">native2ascii tool for Windows</a>
+ * @see java.util.Properties
*/
public class Properties extends Hashtable {
/**
@@ -106,27 +70,7 @@
*/
protected Properties defaults;
- // THIS WILL IGNORE THE ENCODING AND NOT THROW
-
/**
- * @deprecated
- */
- public Properties(String resource,String encoding) {
- try {
- load( getClass().getResourceAsStream(resource) );
- } catch(Throwable t) {
- t.printStackTrace();
- }
- }
-
- /**
- * @deprecated
- */
- public Properties(String resource, int length, String encoding) {
- this(resource, encoding);
- }
-
- /**
* Creates an empty property list with no default values.
*/
public Properties() {
@@ -981,7 +925,7 @@
* is not a string.
* @see java.util.Enumeration
* @see java.util.Properties#defaults
- * @see #stringPropertyNames
+ * @see java.util.Properties#stringPropertyNames
*/
public Enumeration propertyNames() {
Hashtable h = new Hashtable();
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.
|
