Fix map editor

armin-reichert · Jun 22, 2024 · 9fa66fa · 9fa66fa
1 parent c4ca2e1
commit 9fa66fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/mapeditor/src/main/java/de/amr/games/pacman/mapeditor/PropertyEditor.java b/mapeditor/src/main/java/de/amr/games/pacman/mapeditor/PropertyEditor.java
@@ -27,7 +27,7 @@ public class PropertyEditor extends BorderPane {
     public final BooleanProperty enabledPy = new SimpleBooleanProperty(true);
 
     private final TileMapEditor editor;
-    private final TileMap tileMap;
+    private TileMap tileMap;
     private Properties editedProperties;
     private final GridPane grid = new GridPane();
     private final List<ColorPicker> colorPickers = new ArrayList<>();
@@ -36,9 +36,8 @@ public class PropertyEditor extends BorderPane {
 
     private int numRows;
 
-    public PropertyEditor(String title, TileMapEditor editor, TileMap tileMap) {
+    public PropertyEditor(String title, TileMapEditor editor) {
         this.editor = editor;
-        this.tileMap = tileMap;
 
         var lblTitle = new Label(title);
         lblTitle.setFont(Font.font("Sans", FontWeight.BOLD, 14));
@@ -57,12 +56,13 @@ public PropertyEditor(String title, TileMapEditor editor, TileMap tileMap) {
         setCenter(grid);
     }
 
-    public void edit(Properties properties) {
-        this.editedProperties = properties;
+    public void edit(TileMap tileMap) {
+        this.tileMap = tileMap;
+        this.editedProperties = tileMap.getProperties();
         rebuildEditors();
     }
 
-    public void rebuildEditors() {
+    private void rebuildEditors() {
         colorPickers.clear();
         tileXEditors.clear();
         tileYEditors.clear();
@@ -78,6 +78,7 @@ public void rebuildEditors() {
             int nameColumnMinWidth = 160;
             nameEditor.setMinWidth(nameColumnMinWidth);
             nameEditor.disableProperty().bind(enabledPy.not());
+            nameEditor.setOnAction(e -> rebuildEditors());
             grid.add(nameEditor, 0, row);
             if (propertyName.startsWith("color_")) {
                 var colorPicker = new ColorPicker();

diff --git a/mapeditor/src/main/java/de/amr/games/pacman/mapeditor/TileMapEditor.java b/mapeditor/src/main/java/de/amr/games/pacman/mapeditor/TileMapEditor.java
@@ -294,11 +294,11 @@ private void createLayout() {
 
         palettesTabPane = new TabPane(terrainPaletteTab, actorPaletteTab, foodPaletteTab);
 
-        terrainMapPropertiesEditor = new PropertyEditor(tt("terrain"), this, map().terrain());
+        terrainMapPropertiesEditor = new PropertyEditor(tt("terrain"), this);
         terrainMapPropertiesEditor.enabledPy.bind(editingEnabledPy);
         terrainMapPropertiesEditor.setPadding(new Insets(10,0,0,0));
 
-        foodMapPropertiesEditor = new PropertyEditor(tt("pellets"), this, map().food());
+        foodMapPropertiesEditor = new PropertyEditor(tt("pellets"), this);
         foodMapPropertiesEditor.enabledPy.bind(editingEnabledPy);
         foodMapPropertiesEditor.setPadding(new Insets(10,0,0,0));
 
@@ -447,8 +447,8 @@ private void addBorder(TileMap terrain, int emptyRowsTop, int emptyRowsBottom) {
     public void setMap(WorldMap other) {
         checkNotNull(other);
         mapPy.set(other);
-        foodMapPropertiesEditor.edit(map().food().getProperties());
-        terrainMapPropertiesEditor.edit(map().terrain().getProperties());
+        foodMapPropertiesEditor.edit(map().food());
+        terrainMapPropertiesEditor.edit(map().terrain());
         invalidatePaths();
         updatePaths();
         Logger.debug("Edit canvas size: w={} h={}", editCanvas.getWidth(), editCanvas.getHeight());