[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [1440] VASSAL-src/trunk/VASSA
Brought to you by:
rodneykinney,
uckelman
From: <rod...@us...> - 2006-11-10 05:21:39
|
Revision: 1440 http://svn.sourceforge.net/vassalengine/?rev=1440&view=rev Author: rodneykinney Date: 2006-11-09 21:21:31 -0800 (Thu, 09 Nov 2006) Log Message: ----------- merge from swampwallaby-merge@1436 GlobalProperty: initialize with default value Labeler: enable antialiasing Modified Paths: -------------- VASSAL-src/trunk/VASSAL/Info.java VASSAL-src/trunk/VASSAL/build/module/properties/GlobalProperty.java VASSAL-src/trunk/VASSAL/counters/Labeler.java Modified: VASSAL-src/trunk/VASSAL/Info.java =================================================================== --- VASSAL-src/trunk/VASSAL/Info.java 2006-11-10 04:21:51 UTC (rev 1439) +++ VASSAL-src/trunk/VASSAL/Info.java 2006-11-10 05:21:31 UTC (rev 1440) @@ -30,7 +30,7 @@ * Class for storing release-related information */ public final class Info { - private static final String VERSION = "2.9"; + private static final String VERSION = "2.9.1"; private static Boolean is2dEnabled; private static Boolean isDndEnabled; /** This class should not be instantiated */ Modified: VASSAL-src/trunk/VASSAL/build/module/properties/GlobalProperty.java =================================================================== --- VASSAL-src/trunk/VASSAL/build/module/properties/GlobalProperty.java 2006-11-10 04:21:51 UTC (rev 1439) +++ VASSAL-src/trunk/VASSAL/build/module/properties/GlobalProperty.java 2006-11-10 05:21:31 UTC (rev 1440) @@ -148,6 +148,7 @@ public void addTo(Buildable parent) { // Initialize property with current values + setPropertyValue(initialValue); propertyChangeSupport.addPropertyChangeListener(((GlobalPropertiesContainer) parent).getPropertyListener()); propertyChangeSupport.firePropertyChange(getConfigureName(), null, propertyValue); tempToolbar.setDelegate((ToolBarComponent) parent); @@ -180,6 +181,9 @@ } public void setup(boolean gameStarting) { + if (!gameStarting) { + setPropertyValue(initialValue); // Set value back to default for next New Game + } return; } Modified: VASSAL-src/trunk/VASSAL/counters/Labeler.java =================================================================== --- VASSAL-src/trunk/VASSAL/counters/Labeler.java 2006-11-10 04:21:51 UTC (rev 1439) +++ VASSAL-src/trunk/VASSAL/counters/Labeler.java 2006-11-10 05:21:31 UTC (rev 1440) @@ -26,6 +26,7 @@ import java.awt.Image; import java.awt.Point; import java.awt.Rectangle; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.geom.AffineTransform; import java.awt.geom.Area; @@ -215,6 +216,7 @@ g.drawRect(x0, y0, width, height); } g.setColor(fgColor); + ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); g.drawString(" " + text + " ", x0, y0 + g.getFontMetrics().getHeight() - g.getFontMetrics().getDescent()); } @@ -338,6 +340,7 @@ int height = lbl.getHeight(); BufferedImage im = new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR); Graphics g = im.createGraphics(); + ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); if (textBg != null) { g.setColor(textBg); g.fillRect(0, 0, width, height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |