[tiled] r688 - in branches/0.6: . src/tiled/io/xml src/tiled/mapeditor/widget

[svn@biggeruniverse.com]

Author: bjorn
Date: 2006-07-08 06:55:38 -0500 (Sat, 08 Jul 2006)
New Revision: 688

Modified:
   branches/0.6/CHANGES
   branches/0.6/src/tiled/io/xml/XMLMapWriter.java
   branches/0.6/src/tiled/mapeditor/widget/TileButton.java
Log:
Backported another two small fixes from the trunk.


Modified: branches/0.6/CHANGES
===================================================================
--- branches/0.6/CHANGES	2006-07-08 11:36:23 UTC (rev 687)
+++ branches/0.6/CHANGES	2006-07-08 11:55:38 UTC (rev 688)
@@ -1,8 +1,10 @@
 0.6.1 - Unreleased
 
-* Fixed selection of TMX as default map format also when plugins are loaded
+* Fixed failing to default to map format by extention when plugins are loaded
 * Fixed active marquee not being reset on loading a map
 * Fixed layer duplicates to not share layer properties with the original
+* Fixed width of tile button changing between selecting a tile and no tile
+* Fixed creation of one-tile gaps between tilesets on saving (Christian Henz)
 
 0.6.0 - June 23rd, 2006
 

Modified: branches/0.6/src/tiled/io/xml/XMLMapWriter.java
===================================================================
--- branches/0.6/src/tiled/io/xml/XMLMapWriter.java	2006-07-08 11:36:23 UTC (rev 687)
+++ branches/0.6/src/tiled/io/xml/XMLMapWriter.java	2006-07-08 11:55:38 UTC (rev 688)
@@ -135,7 +135,7 @@
             TileSet tileset = (TileSet)itr.next();
             tileset.setFirstGid(firstgid);
             writeTilesetReference(tileset, w, wp);
-            firstgid += tileset.getMaxTileId() + 1;
+            firstgid += tileset.getMaxTileId();
         }
 
         Iterator ml = map.getLayers();

Modified: branches/0.6/src/tiled/mapeditor/widget/TileButton.java
===================================================================
--- branches/0.6/src/tiled/mapeditor/widget/TileButton.java	2006-07-08 11:36:23 UTC (rev 687)
+++ branches/0.6/src/tiled/mapeditor/widget/TileButton.java	2006-07-08 11:55:38 UTC (rev 688)
@@ -26,7 +26,7 @@
  */
 public class TileButton extends JButton
 {
-    private static final int ICON_SIZE = 24;
+    private static final int ICON_SIZE = 22;
     private static final Icon DEFAULT_ICON = Resources.getIcon("empty.png");
 
     public TileButton() {