[Jrisk-cvs] SF.net SVN: jrisk:[826] Domination

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

Revision: 826
          http://jrisk.svn.sourceforge.net/jrisk/?rev=826&view=rev
Author:   yuranet
Date:     2012-06-30 20:23:49 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
save and undo icons added

Modified Paths:
--------------
    Domination/src_android/net/yura/domination/mobile/flashgui/DominationMain.java
    Domination/src_android/net/yura/domination/mobile/flashgui/GameActivity.java
    Domination/src_android/net/yura/domination/mobile/flashgui/MiniFlashGUI.java

Added Paths:
-----------
    Domination/res/drawable-hdpi/save.png
    Domination/res/drawable-mdpi/save.png
    Domination/res/drawable-mdpi/undo.png

Added: Domination/res/drawable-hdpi/save.png
===================================================================
(Binary files differ)


Property changes on: Domination/res/drawable-hdpi/save.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: Domination/res/drawable-mdpi/save.png
===================================================================
(Binary files differ)


Property changes on: Domination/res/drawable-mdpi/save.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: Domination/res/drawable-mdpi/undo.png
===================================================================
(Binary files differ)


Property changes on: Domination/res/drawable-mdpi/undo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: Domination/src_android/net/yura/domination/mobile/flashgui/DominationMain.java
===================================================================
--- Domination/src_android/net/yura/domination/mobile/flashgui/DominationMain.java	2012-06-30 17:53:38 UTC (rev 825)
+++ Domination/src_android/net/yura/domination/mobile/flashgui/DominationMain.java	2012-06-30 20:23:49 UTC (rev 826)
@@ -19,8 +19,12 @@
 import net.yura.domination.mobile.RiskMiniIO;
 import net.yura.grasshopper.SimpleBug;
 import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.Graphics2D;
+import net.yura.mobile.gui.Icon;
 import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.components.Component;
 import net.yura.mobile.gui.components.OptionPane;
+import net.yura.mobile.gui.plaf.Style;
 import net.yura.mobile.gui.plaf.SynthLookAndFeel;
 import net.yura.mobile.gui.plaf.nimbus.NimbusLookAndFeel;
 import net.yura.swingme.core.CoreUtil;
@@ -84,6 +88,14 @@
         
         try {
             synth = (SynthLookAndFeel)Class.forName("net.yura.android.plaf.AndroidLookAndFeel").newInstance();
+
+            // small hack to center radiobutton icon
+            Style radioButtonStyle = synth.getStyle("RadioButton");
+            Icon radioButtonIcon = (Icon)radioButtonStyle.getProperty("icon", Style.ALL);
+            if (radioButtonIcon!=null) {
+                radioButtonStyle.addProperty( new CentreIcon(radioButtonIcon,radioButtonIcon.getIconWidth(),radioButtonIcon.getIconWidth()), "icon", Style.ALL);
+            }
+            
         }
         catch (Exception ex) {
             synth = new NimbusLookAndFeel();
@@ -136,6 +148,20 @@
         }
 
     }
+    
+    public static class CentreIcon extends Icon {
+        Icon wrappedIcon;
+        public CentreIcon(Icon icon,int w,int h) {
+            wrappedIcon = icon;
+            width = w;
+            height = h;
+        }
+        @Override
+        public void paintIcon(Component c, Graphics2D g, int x, int y) {
+            // paint real icon in the middle of this icon
+            wrappedIcon.paintIcon(c, g, x + (getIconWidth()-wrappedIcon.getIconWidth())/2, y + (getIconHeight()-wrappedIcon.getIconHeight())/2);
+        }
+    }
 
     public static void copyFolder(File src, File dest) throws IOException{
      

Modified: Domination/src_android/net/yura/domination/mobile/flashgui/GameActivity.java
===================================================================
--- Domination/src_android/net/yura/domination/mobile/flashgui/GameActivity.java	2012-06-30 17:53:38 UTC (rev 825)
+++ Domination/src_android/net/yura/domination/mobile/flashgui/GameActivity.java	2012-06-30 20:23:49 UTC (rev 826)
@@ -85,6 +85,7 @@
         // MWMWMWMWMWMWM MENU MWMWMWMWMWMWMW
         
         savebutton = new Button( resb.getProperty("game.menu.save") );
+        savebutton.setIcon( new Icon("/save.png") );
         savebutton.addActionListener(this);
         savebutton.setActionCommand("save");
         
@@ -93,6 +94,7 @@
         graphbutton.setActionCommand("graph");
         
         undobutton = new Button( resb.getProperty("game.button.undo") );
+        undobutton.setIcon( new Icon("/undo.png") );
         undobutton.addActionListener(this);
         undobutton.setActionCommand("undo");
 

Modified: Domination/src_android/net/yura/domination/mobile/flashgui/MiniFlashGUI.java
===================================================================
--- Domination/src_android/net/yura/domination/mobile/flashgui/MiniFlashGUI.java	2012-06-30 17:53:38 UTC (rev 825)
+++ Domination/src_android/net/yura/domination/mobile/flashgui/MiniFlashGUI.java	2012-06-30 20:23:49 UTC (rev 826)
@@ -429,7 +429,7 @@
     }
     
     public static int adjustSizeToDensityFromMdpi(int size) {
-        return XULLoader.adjustSizeToDensity( (int)(size * 0.75) );
+        return XULLoader.adjustSizeToDensity( (int)(size * 0.75 +0.5) );
     }
 
     public void showCardsFile(String c, boolean hasMission) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.