tilemap-editor 2.0.11__tar.gz → 3.0.0__tar.gz

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilemap-editor
-Version: 2.0.11
+Version: 3.0.0
 Summary: Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools
 Author: tilemap editor contributors
 License: Proprietary
@@ -30,6 +30,19 @@ Dynamic: license-file
 
 ### Quick Start
 
+If used for the first time do run the following commands. Afterward you can simply run wherever you want.
+
+It is required because it initialize project settings on `settings.json`
+
+```bash
+tilemap-editor init
+```
+
+```bash
+tilemap-editor run
+```
+
+
 ```python
 from editor import Editor
 

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/README.md

@@ -14,6 +14,19 @@
 
 ### Quick Start
 
+If used for the first time do run the following commands. Afterward you can simply run wherever you want.
+
+It is required because it initialize project settings on `settings.json`
+
+```bash
+tilemap-editor init
+```
+
+```bash
+tilemap-editor run
+```
+
+
 ```python
 from editor import Editor
 

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tilemap-editor"
-version = "2.0.11"
+version = "3.0.0"
 description = "Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -52,5 +52,18 @@ include = [
 ]
 namespaces = true
 
+[tool.setuptools.package-data]
+"tilemap_editor.assets" = [
+  "icons/*.svg",
+  "fonts/noto/*.ttf",
+  "fonts/jetbrain-fonts/*.ttf"
+]
+
 [tool.setuptools.exclude-package-data]
 "*" = ["*.spec", "*.sh"]
+
+# Keep data-files for backward compatibility (one release cycle)
+[tool.setuptools.data-files]
+"share/tilemap_editor/assets/icons" = ["assets/icons/*.svg"]
+"share/tilemap_editor/assets/fonts/noto" = ["assets/fonts/noto/*.ttf"]
+"share/tilemap_editor/assets/fonts/jetbrain-fonts" = ["assets/fonts/jetbrain-fonts/*.ttf"]

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/editor.py

@@ -253,13 +253,10 @@ class Editor:
         ]
 
         if initial_dir:
-            try:
-                rel_path = initial_dir.relative_to(self.base_path)
-                args.extend(["--initial-dir", str(rel_path)])
-            except ValueError:
-                args.extend(["--initial-dir", str(initial_dir)])
+            args.extend(["--initial-dir", str(initial_dir.resolve())])
         else:
-            args.extend(["--initial-dir", str(self.base_path / "data")])
+            args.extend(["--initial-dir", str(self.data_root.resolve())])
+        args.extend(["--data-root", str(self.data_root.resolve())])
 
         # Add allowed extensions
         if allowed_exts:
@@ -392,7 +389,7 @@ class Editor:
         if self.tilemap.active_project_path:
             default_name = self.tilemap.active_project_path.name
         self.open_file_manager(
-            initial_dir=self.base_path / "data",
+            initial_dir=self.data_root,
             allowed_exts=[".json"],
             mode="save",
             default_name=default_name,
@@ -414,7 +411,7 @@ class Editor:
     def perform_load(self):
         self.open_file_manager(
             on_select=self.on_map_file_selected,
-            initial_dir=self.base_path / "data",
+            initial_dir=self.data_root,
             allowed_exts=[".json"],
         )
 
@@ -595,6 +592,7 @@ class Editor:
                 tile_size=(32, 32),  # Default tile size
                 consumer=consumer,
             )
+            self.animation_panel._data_root = self.data_root
         except Exception as e:
             error_handler.capture(e, context="init_animation_panel")
             self.notifications.notify(f"Failed to init animation panel: {e}")
@@ -650,17 +648,12 @@ class Editor:
     def launch_animation_editor(self):
         """Launch the sprite animation editor in a new window.
 
-        Uses the active tileset image when one is loaded so the editor opens
-        immediately. If no tileset is selected, a file picker asks for a sheet.
+        Always asks for a spritesheet instead of assuming the active tileset is
+        the animation source.
         """
-        sheet = self._active_tileset_image_path()
-        if sheet is not None:
-            self._launch_animation_editor_with_image(sheet)
-            return
-
         self.open_file_manager(
             on_select=self._launch_animation_editor_with_image,
-            initial_dir=self.base_path / "data",
+            initial_dir=self.data_root,
             allowed_exts=[".png", ".jpg", ".jpeg"],
             mode="open",
         )
@@ -773,7 +766,7 @@ class Editor:
         """
         self.open_file_manager(
             on_select=self._launch_character_collision_editor_with_image,
-            initial_dir=self.base_path / "data",
+            initial_dir=self.data_root,
             allowed_exts=[".png", ".jpg", ".jpeg"],
             mode="open",
         )

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/character_collision/standalone.py

@@ -21,7 +21,10 @@ if str(_src_dir) not in sys.path:
 
 import pygame
 
-from .editor import CharacterCollisionEditor
+try:
+    from .editor import CharacterCollisionEditor
+except ImportError:
+    from plugins.character_collision.editor import CharacterCollisionEditor
 from utils import error_handler, error_context
 
 

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/object_tileset_collision/editor.py

@@ -6,8 +6,8 @@ Layout:
     | [Save] [Load] | Define Regions | Paint Collision | [?]    |
     +---------------+--------------------------------+-------------+
     | Regions List  |   Collision Painter (Region)   |  StatusBar  |
-    | - Tree (✓)    |                                |             |
-    | - Rock (⚠)    |   [Region image, zoomed]       |  3 shapes   |
+    | - Tree (ok)   |                                |             |
+    | - Rock (warn) |   [Region image, zoomed]       |  3 shapes   |
     | - Player (?)|                                |  Complete   |
     +---------------+--------------------------------+-------------+
     |           Object Tileset (Region Selector)                   |
@@ -59,6 +59,36 @@ class RegionStatus:
     is_valid: bool = True
 
 
+def _render_fit_text(
+    font: pygame.font.Font,
+    text: str,
+    color: Tuple[int, int, int],
+    max_width: int,
+) -> Surface:
+    """Render text constrained to max_width with an ellipsis."""
+    if max_width <= 0:
+        return font.render("", True, color)
+
+    surf = font.render(text, True, color)
+    if surf.get_width() <= max_width:
+        return surf
+
+    ellipsis = "..."
+    if font.size(ellipsis)[0] > max_width:
+        return font.render("", True, color)
+
+    low, high = 0, len(text)
+    while low < high:
+        mid = (low + high + 1) // 2
+        candidate = text[:mid].rstrip() + ellipsis
+        if font.size(candidate)[0] <= max_width:
+            low = mid
+        else:
+            high = mid - 1
+
+    return font.render(text[:low].rstrip() + ellipsis, True, color)
+
+
 class ObjectTilesetCollisionEditor:
     """
     Main editor for object tileset collision shapes.
@@ -610,8 +640,8 @@ class ObjectTilesetCollisionEditor:
         # Close button
         close_btn = Rect(panel_rect.right - 35, panel_y + 10, 25, 25)
         pygame.draw.rect(screen, COLORS.danger, close_btn, border_radius=SHAPE.radius_sm)
-        close_text = self._font.render("×", True, COLORS.text)
-        screen.blit(close_text, (close_btn.centerx - close_text.get_width() // 2, close_btn.centery - close_text.get_height() // 2))
+        close_icon = icon_manager.get_icon("close", 15, COLORS.text)
+        screen.blit(close_icon, close_icon.get_rect(center=close_btn.center))
         
         # Content
         help_text = [
@@ -642,8 +672,8 @@ class ObjectTilesetCollisionEditor:
             ("   • Middle mouse drag: Pan (always works)", False),
             ("", False),
             ("Status Icons:", True),
-            ("   ✓ = Has collision shapes", False),
-            ("   ⚠ = No collision defined yet", False),
+            ("   Check icon = Has collision shapes", False),
+            ("   Warning icon = No collision defined yet", False),
             ("   ? = Unnamed region", False),
             ("", False),
             ("Shortcuts:", True),
@@ -900,11 +930,6 @@ class ObjectTilesetCollisionEditor:
         load_label = self._font.render("Load", True, COLORS.text)
         draw_button(screen, load_btn_rect, load_label, hover=load_hover)
         
-        # Title (centered, after mode indicator)
-        title = self._font.render(f"— {self._tileset_name}", True, COLORS.text_dim)
-        title_x = self.mode_indicator.rect.right + 20
-        screen.blit(title, (title_x, self.toolbar_rect.centery - title.get_height() // 2))
-        
         # Help button (info icon)
         help_btn_rect = Rect(self.toolbar_rect.right - 38, self.toolbar_rect.y + 8, 28, 28)
         help_hover = help_btn_rect.collidepoint(mouse)
@@ -913,6 +938,17 @@ class ObjectTilesetCollisionEditor:
         pygame.draw.rect(screen, COLORS.border_soft, help_btn_rect, 1, border_radius=SHAPE.radius_sm)
         screen.blit(help_icon, (help_btn_rect.centerx - 10, help_btn_rect.centery - 10))
 
+        # Title after mode indicator, clipped before the help button.
+        title_x = self.mode_indicator.rect.right + 20
+        title_max_w = help_btn_rect.x - title_x - 10
+        title = _render_fit_text(
+            self._font,
+            f"- {self._tileset_name}",
+            COLORS.text_dim,
+            title_max_w,
+        )
+        screen.blit(title, (title_x, self.toolbar_rect.centery - title.get_height() // 2))
+
     def _draw_regions_list(self, screen: Surface) -> None:
         """Draw the regions list panel"""
         draw_panel(screen, self.regions_list_rect, COLORS.panel, COLORS.border)
@@ -950,9 +986,9 @@ class ObjectTilesetCollisionEditor:
             icon_y = item_rect.centery - 6
             
             if status.has_collision:
-                icon = self._font_sm.render("✓", True, COLORS.success)
+                icon = icon_manager.get_icon("check", 12, COLORS.success)
             elif region.name and not region.name.startswith("Region "):
-                icon = self._font_sm.render("⚠", True, COLORS.warning)
+                icon = icon_manager.get_icon("warning", 12, COLORS.warning)
             else:
                 icon = self._font_sm.render("?", True, COLORS.text_dim)
             
@@ -974,10 +1010,20 @@ class ObjectTilesetCollisionEditor:
                 pygame.draw.rect(screen, (100, 120, 140), 
                     Rect(name_x, item_rect.y + 5, item_rect.width - 30, 20), border_radius=2)
                 
-                name_surf = self._font.render(display_name, True, COLORS.text)
+                name_surf = _render_fit_text(
+                    self._font,
+                    display_name,
+                    COLORS.text,
+                    item_rect.right - name_x - 8,
+                )
             else:
                 name = region.name or "Unnamed"
-                name_surf = self._font.render(name, True, COLORS.text)
+                name_surf = _render_fit_text(
+                    self._font,
+                    name,
+                    COLORS.text,
+                    item_rect.right - name_x - 8,
+                )
             
             screen.blit(name_surf, (name_x, item_rect.y + 8))
             
@@ -1080,4 +1126,4 @@ class ObjectTilesetCollisionEditor:
             screen.fill((20, 20, 20))
             self.draw(screen)
             pygame.display.flip()
-            clock.tick(60)
+            clock.tick(60)

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/object_tileset_collision/standalone.py

@@ -22,7 +22,10 @@ if sys.platform == "darwin":
 
 import pygame
 
-from .editor import ObjectTilesetCollisionEditor
+try:
+    from .editor import ObjectTilesetCollisionEditor
+except ImportError:
+    from plugins.object_tileset_collision.editor import ObjectTilesetCollisionEditor
 from utils import error_handler, error_context
 
 
@@ -94,4 +97,4 @@ def main(argv: list[str] | None = None) -> None:
 
 
 if __name__ == "__main__":
-    main()
+    main()

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/sprite_animation/editor.py

@@ -22,6 +22,7 @@ import pygame
 from pygame import Rect, Surface, Color
 from utils.font_manager import font_manager, FontWeight, FontStyle
 from utils.icon_manager import icon_manager
+from utils.project_paths import resolve_project_path
 from utils import error_handler
 from .clipboard_util import copy_plain_text
 from .frame_picker import FramePicker
@@ -103,7 +104,7 @@ class SpriteAnimationEditor:
     Layout::
 
         +----------------------------------------------------+
-        | Toolbar: [idle ▾] [+] [✕] | [Save] [Load]         |
+        | Toolbar: [idle] [+] [X] | [Save] [Load]           |
         +---------------+------------------------------------+
         |   Preview     |     Spritesheet Frame Picker       |
         |   (220px w)   |     (pan/zoom, click to add)       |
@@ -242,6 +243,7 @@ class SpriteAnimationEditor:
 
         # Track the last saved path for quick save (Ctrl+S)
         self._last_saved_path: Optional[Path] = None
+        self._data_root: Optional[Path] = Path.cwd() / "data"
 
         # Sync sub-widgets
         self._sync_active_animation()
@@ -867,7 +869,7 @@ class SpriteAnimationEditor:
         self._draw_toolbar_btn(screen, self._btn_new, "+", mouse)
         x += 32
 
-        # [✕ Delete]
+        # Delete
         self._btn_del = Rect(x, cy, 28, bh)
         # Close/X icon for delete
         close_icon = icon_manager.get_icon("close", 14, _COLORS["btn_danger_hover"])
@@ -1174,7 +1176,7 @@ class SpriteAnimationEditor:
         if self._info_tooltip_pinned:
             lines.append("Esc or click outside card to close")
         else:
-            lines.append("Click ⓘ to pin this panel")
+            lines.append("Click info to pin this panel")
 
         padding = 8
         line_height = 16
@@ -1674,8 +1676,8 @@ class SpriteAnimationEditor:
 
             pygame.draw.rect(screen, _COLORS["btn_danger"], del_rect, border_radius=3)
             pygame.draw.rect(screen, _COLORS["border"], del_rect, 1, border_radius=3)
-            x_lbl = self._font_sm.render("×", True, _COLORS["text"])
-            screen.blit(x_lbl, x_lbl.get_rect(center=del_rect.center))
+            close_icon = icon_manager.get_icon("close", 12, _COLORS["text"])
+            screen.blit(close_icon, close_icon.get_rect(center=del_rect.center))
 
             row_y += META_ROW_H
 
@@ -1802,13 +1804,12 @@ class SpriteAnimationEditor:
         # Import FileManager
         try:
             from widgets.filemanager import FileManager
-            from constants import BASE_PATH
         except ImportError as e:
             # Fallback to old behavior if FileManager not available
             print(f"Warning: Could not import FileManager: {e}")
             path = self._default_save_path()
             try:
-                self.library.save(path)
+                self.library.save(path, base_path=self._project_base_path())
                 self._last_saved_path = path
                 print(f"Animations saved to {path}")
             except Exception as e:
@@ -1821,12 +1822,12 @@ class SpriteAnimationEditor:
             initial_dir = self._last_saved_path.parent
             default_name = self._last_saved_path.name
         elif self.library.spritesheet_path:
-            # Use spritesheet location
-            initial_dir = Path(self.library.spritesheet_path).parent
+            initial_dir = self._data_root / "animations"
             default_name = Path(self.library.spritesheet_path).stem + ".anim.json"
         else:
             initial_dir = self._data_root / "animations"
             default_name = "animations.anim.json"
+        initial_dir.mkdir(parents=True, exist_ok=True)
 
         # Create file manager for save
         screen = pygame.display.get_surface()
@@ -1842,6 +1843,7 @@ class SpriteAnimationEditor:
             mode="save",
             default_name=default_name,
             on_cancel=self._close_file_manager,
+            data_root=self._data_root,
         )
 
     def _quick_save(self) -> None:
@@ -1852,7 +1854,10 @@ class SpriteAnimationEditor:
         if self._last_saved_path:
             # Save to existing path
             try:
-                self.library.save(self._last_saved_path)
+                self.library.save(
+                    self._last_saved_path,
+                    base_path=self._project_base_path(),
+                )
                 print(f"Animations saved to {self._last_saved_path}")
             except Exception as e:
                 error_handler.capture(e, context="save_animations_quick")
@@ -1867,13 +1872,13 @@ class SpriteAnimationEditor:
         # Import FileManager
         try:
             from widgets.filemanager import FileManager
-            from constants import BASE_PATH
         except ImportError:
             # Fallback to old behavior if FileManager not available
             path = self._default_save_path()
             if path.exists():
                 try:
                     self.library = AnimationLibrary.load(path)
+                    self._resolve_library_paths(path)
                     names = self.library.animation_names()
                     self._active_anim_name = names[0] if names else None
                     if not names:
@@ -1886,11 +1891,9 @@ class SpriteAnimationEditor:
                 print(f"No animation file found at {path}")
             return
 
-        # Get initial directory from spritesheet path or use data folder
-        if self.library.spritesheet_path:
-            initial_dir = Path(self.library.spritesheet_path).parent
-        else:
-            initial_dir = self._data_root / "animations"
+        # Load project animation files from the configured data folder.
+        initial_dir = self._data_root / "animations"
+        initial_dir.mkdir(parents=True, exist_ok=True)
 
         # Create file manager for load
         screen = pygame.display.get_surface()
@@ -1905,12 +1908,13 @@ class SpriteAnimationEditor:
             on_select=self._on_load_file_selected,
             mode="open",
             on_cancel=self._close_file_manager,
+            data_root=self._data_root,
         )
 
     def _on_save_file_selected(self, path: Path) -> None:
         """Callback when user selects a file to save to."""
         try:
-            self.library.save(path)
+            self.library.save(path, base_path=self._project_base_path())
             self._last_saved_path = path  # Track for quick save
             print(f"Animations saved to {path}")
         except Exception as e:
@@ -1928,6 +1932,7 @@ class SpriteAnimationEditor:
         if path.exists():
             try:
                 self.library = AnimationLibrary.load(path)
+                self._resolve_library_paths(path)
                 self._last_saved_path = path  # Track loaded file as save location
                 names = self.library.animation_names()
                 self._active_anim_name = names[0] if names else None
@@ -1952,16 +1957,12 @@ class SpriteAnimationEditor:
         # Import FileManager
         try:
             from widgets.filemanager import FileManager
-            from constants import BASE_PATH
         except ImportError as e:
             print(f"Warning: Could not import FileManager: {e}")
             return
 
-        # Get initial directory
-        if self.library.spritesheet_path:
-            initial_dir = Path(self.library.spritesheet_path).parent
-        else:
-            initial_dir = self._data_root / "animations"
+        initial_dir = self._data_root
+        initial_dir.mkdir(parents=True, exist_ok=True)
 
         # Create file manager for loading spritesheet
         screen = cast(Surface, pygame.display.get_surface())
@@ -1976,6 +1977,7 @@ class SpriteAnimationEditor:
             on_select=self._on_spritesheet_selected,
             mode="open",
             on_cancel=self._close_file_manager,
+            data_root=self._data_root,
         )
 
     def _on_spritesheet_selected(self, path: Union[Path, List[Path]]) -> None:
@@ -2022,6 +2024,26 @@ class SpriteAnimationEditor:
             return Path(self.library.spritesheet_path).parent / f"{base}.anim.json"
         return Path.cwd() / "animations.anim.json"
 
+    def _project_base_path(self) -> Optional[Path]:
+        if self._data_root is None:
+            return None
+        return Path(self._data_root).parent
+
+    def _resolve_library_paths(self, json_path: Path) -> None:
+        if not self.library.spritesheet_path:
+            return
+        base_path = self._project_base_path()
+        if base_path is None:
+            return
+        self.library.spritesheet_path = str(
+            resolve_project_path(
+                self.library.spritesheet_path,
+                base_path,
+                fallback_roots=[json_path.parent],
+                must_exist=True,
+            )
+        )
+
     # ------------------------------------------------------------------
     # Integration helpers
     # ------------------------------------------------------------------

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/sprite_animation/models.py

@@ -12,6 +12,8 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
+from utils.project_paths import to_project_path
+
 
 @dataclass
 class AnimationMarker:
@@ -189,9 +191,13 @@ class AnimationLibrary:
     def animation_names(self) -> List[str]:
         return list(self.animations.keys())
 
-    def to_dict(self) -> dict:
+    def to_dict(self, *, base_path: Optional[Path] = None) -> dict:
+        spritesheet_path = self.spritesheet_path
+        if spritesheet_path and base_path is not None:
+            spritesheet_path = to_project_path(spritesheet_path, base_path)
+
         return {
-            "spritesheet_path": self.spritesheet_path,
+            "spritesheet_path": spritesheet_path,
             "tile_size": list(self.tile_size),
             "animations": {
                 name: anim.to_dict() for name, anim in self.animations.items()
@@ -208,10 +214,10 @@ class AnimationLibrary:
             lib.animations[name] = Animation.from_dict(anim_data)
         return lib
 
-    def save(self, path: Path) -> None:
+    def save(self, path: Path, *, base_path: Optional[Path] = None) -> None:
         path.parent.mkdir(parents=True, exist_ok=True)
         with open(path, "w", encoding="utf-8") as f:
-            json.dump(self.to_dict(), f, indent=2)
+            json.dump(self.to_dict(base_path=base_path), f, indent=2)
 
     @staticmethod
     def load(path: Path) -> AnimationLibrary:

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/sprite_animation/runtime_load.py

@@ -198,17 +198,16 @@ class SpriteAnimRuntime:
 
         img_path = Path(sheet_ref)
         if not img_path.is_absolute():
-            cand = (p.parent / img_path).resolve()
-            if cand.is_file():
-                img_path = cand
-            elif extra_search_base is not None:
-                cand2 = (Path(extra_search_base) / sheet_ref).resolve()
-                if cand2.is_file():
-                    img_path = cand2
-                else:
-                    img_path = cand
-            else:
-                img_path = cand
+            candidates = [(p.parent / img_path).resolve()]
+            if extra_search_base is not None:
+                candidates.append((Path(extra_search_base) / sheet_ref).resolve())
+            candidates.extend((parent / img_path).resolve() for parent in p.parents)
+
+            img_path = candidates[0]
+            for candidate in candidates:
+                if candidate.is_file():
+                    img_path = candidate
+                    break
 
         if not img_path.is_file():
             raise AnimationParseError(f"Spritesheet not found: {sheet_ref!r} (tried {img_path})")

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/sprite_animation/standalone.py

@@ -22,7 +22,10 @@ if str(_src_dir) not in sys.path:
 
 import pygame
 
-from .editor import SpriteAnimationEditor
+try:
+    from .editor import SpriteAnimationEditor
+except ImportError:
+    from plugins.sprite_animation.editor import SpriteAnimationEditor
 from utils import error_handler, error_context
 
 
@@ -106,10 +109,14 @@ def main(argv: list[str] | None = None) -> None:
             )
 
             if args.load and args.load.exists():
-                from .models import AnimationLibrary
+                try:
+                    from .models import AnimationLibrary
+                except ImportError:
+                    from plugins.sprite_animation.models import AnimationLibrary
 
                 lib = AnimationLibrary.load(args.load)
                 editor.load_animation_data(lib.to_dict())
+                editor._resolve_library_paths(args.load)
                 print(f"Loaded animations from {args.load}")
 
             editor.run()

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/tileset_collision/collision_painter.py

@@ -20,6 +20,7 @@ from enum import Enum
 import pygame
 from pygame import Rect
 from utils.font_manager import font_manager, FontWeight
+from utils.icon_manager import icon_manager
 from utils.error_handler import error_handler, error_context
 
 
@@ -718,8 +719,8 @@ class CollisionPainter:
         close_bg = _COLORS["polygon_stroke"] if close_hover else _COLORS["bg"]
         pygame.draw.rect(screen, close_bg, close_btn)
         pygame.draw.rect(screen, _COLORS["border"], close_btn, 1)
-        close_x = self._font.render("×", True, _COLORS["text"])
-        screen.blit(close_x, close_x.get_rect(center=close_btn.center))
+        close_icon = icon_manager.get_icon("close", 14, _COLORS["text"])
+        screen.blit(close_icon, close_icon.get_rect(center=close_btn.center))
         
         # Divider
         pygame.draw.line(

{tilemap_editor-2.0.11 → tilemap_editor-3.0.0}/src/plugins/tileset_collision/standalone.py

@@ -26,7 +26,10 @@ if sys.platform == "darwin":
 
 import pygame
 
-from .editor import TilesetCollisionEditor
+try:
+    from .editor import TilesetCollisionEditor
+except ImportError:
+    from plugins.tileset_collision.editor import TilesetCollisionEditor
 from utils import error_handler, error_context