[tiled] r666 - in trunk: . src/tiled/mapeditor/dialogs src/tiled/mapeditor/util/cutter src/tiled/mapeditor/widget

[svn@biggeruniverse.com]

Author: bjorn
Date: 2006-06-10 16:32:11 -0500 (Sat, 10 Jun 2006)
New Revision: 666

Modified:
   trunk/CHANGES
   trunk/src/tiled/mapeditor/dialogs/TileDialog.java
   trunk/src/tiled/mapeditor/dialogs/TilesetManager.java
   trunk/src/tiled/mapeditor/util/cutter/BasicTileCutter.java
   trunk/src/tiled/mapeditor/widget/TilePalettePanel.java
Log:
Some little updates before sleeping, also reverted the interpretation of tile spacing to what it used to be.

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2006-06-10 19:57:26 UTC (rev 665)
+++ trunk/CHANGES	2006-06-10 21:32:11 UTC (rev 666)
@@ -2,12 +2,13 @@
 + Fixed memory problems when loading several maps with many tilesets in a row
 + Added ability to select multiple layers from layer table
 + Added preview of new tileset when creating a tileset
-+ Added tile cutter GUI
 + Added the Shifted view, which emulates several tiling configurations
 + Added "stamp" tool
 + Added a navigation minimap
 + Added full support for animated tiles
 + Added palette brush
++ Added support for animated tiles
++ Added additional "tile cutters"
 + Rewrote main mapeditor code
 + Moved actions out of MapEditor, and created a package for them
 
@@ -17,9 +18,7 @@
   French and Spanish.
 * Added stamp function for pencil: right-click, drag now creates a stamp
   for easy copying
-* Added core support for animated tiles
 * Added more error-checking to XMLMapTransformer, the default map reader
-* Added support for "tile cutters"
 * Added global properties for tilesets (properties set for all tiles)
 * Added the ability to merge tile images when layers are merged
 * Added more useful visual feedback for some brushes
@@ -41,6 +40,7 @@
 * Fixed resetting of selected tileset in tile palette on layer changes
 * Fixed saving of tile properties when using a tileset image
 * Fixed loading of invisible layers
+* Fixed saving of tile spacing property for tileset images
 * Rewrote configuration based on the Preferences class, no more tiled.conf
 * Cleaned up TileSet (removed checksumming and rotation/orientation code)
 * Removed experimental hexagonal mapview from new map dialog

Modified: trunk/src/tiled/mapeditor/dialogs/TileDialog.java
===================================================================
--- trunk/src/tiled/mapeditor/dialogs/TileDialog.java	2006-06-10 19:57:26 UTC (rev 665)
+++ trunk/src/tiled/mapeditor/dialogs/TileDialog.java	2006-06-10 21:32:11 UTC (rev 666)
@@ -168,8 +168,7 @@
         imageList.setCellRenderer(new ImageCellRenderer());
         imageList.setLayoutOrientation(JList.HORIZONTAL_WRAP);
         imageList.addListSelectionListener(this);
-        JScrollPane sp = new JScrollPane();
-        sp.getViewport().setView(imageList);
+        JScrollPane sp = new JScrollPane(imageList);
         sp.setPreferredSize(new Dimension(150, 150));
 
         // Buttons

Modified: trunk/src/tiled/mapeditor/dialogs/TilesetManager.java
===================================================================
--- trunk/src/tiled/mapeditor/dialogs/TilesetManager.java	2006-06-10 19:57:26 UTC (rev 665)
+++ trunk/src/tiled/mapeditor/dialogs/TilesetManager.java	2006-06-10 21:32:11 UTC (rev 666)
@@ -57,6 +57,7 @@
     private void init() {
         // Create the tileset table
         tilesetTable = new JTable(new TilesetTableModel(map));
+        tilesetTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         tilesetTable.getSelectionModel().addListSelectionListener(this);
         JScrollPane tilesetScrollPane = new JScrollPane(tilesetTable);
         tilesetScrollPane.setPreferredSize(new Dimension(360, 150));

Modified: trunk/src/tiled/mapeditor/util/cutter/BasicTileCutter.java
===================================================================
--- trunk/src/tiled/mapeditor/util/cutter/BasicTileCutter.java	2006-06-10 19:57:26 UTC (rev 665)
+++ trunk/src/tiled/mapeditor/util/cutter/BasicTileCutter.java	2006-06-10 21:32:11 UTC (rev 666)
@@ -37,8 +37,8 @@
         this.offset = offset;
 
         // Do initial setup
-        nextX = offset + tileSpacing;
-        nextY = offset + tileSpacing;
+        nextX = offset;
+        nextY = offset;
     }
 
     public String getName() {
@@ -56,7 +56,7 @@
             nextX += tileWidth + tileSpacing;
 
             if (nextX + tileWidth > image.getWidth()) {
-                nextX = offset + tileSpacing;
+                nextX = offset;
                 nextY += tileHeight + tileSpacing;
             }
 

Modified: trunk/src/tiled/mapeditor/widget/TilePalettePanel.java
===================================================================
--- trunk/src/tiled/mapeditor/widget/TilePalettePanel.java	2006-06-10 19:57:26 UTC (rev 665)
+++ trunk/src/tiled/mapeditor/widget/TilePalettePanel.java	2006-06-10 21:32:11 UTC (rev 666)
@@ -101,7 +101,9 @@
         // We like Tiled to behave in a predictibile manner; i.e.,
         // it should not pick the first tile of the next row if
         // there is empty space on the right of the row.
-        if (x >= tilesPerRow * twidth) x = tilesPerRow * twidth - 1;
+        if (x > tilesPerRow * twidth - 1) {
+            x = tilesPerRow * twidth - 1;
+        }
 
         int tileAt = (y / theight) * tilesPerRow + x / twidth;