[Swingme-svn] SF.net SVN: swingme: [35] SwingME/src/net/yura/mobile/gui

[<yu...@us...>]

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.