Skip to content

Use new dock system for TileMap and TileSet#113034

Merged
Repiteo merged 1 commit into
godotengine:masterfrom
lodetrick:new-dock-tiles
Nov 24, 2025
Merged

Use new dock system for TileMap and TileSet#113034
Repiteo merged 1 commit into
godotengine:masterfrom
lodetrick:new-dock-tiles

Conversation

@lodetrick
Copy link
Copy Markdown
Contributor

See #113024

This PR updates the TileMap and TileSet docks to use the new dock system. Making the docks vertical in this PR ended up being a lot more complicated that I expected due to the nested controls, so I omitted it because it's important to get the simple implementation merged. I'm working on another PR that will add vertical support.

@lodetrick lodetrick requested a review from a team November 22, 2025 01:05
@lodetrick lodetrick requested a review from a team as a code owner November 22, 2025 01:05
@Chaosus Chaosus added this to the 4.x milestone Nov 22, 2025
@KoBeWi
Copy link
Copy Markdown
Member

KoBeWi commented Nov 22, 2025

The docks are visible at editor start, without any TileMap selected. You should probably close them after adding.

EDIT:
There is also some new error when folding TileSet resource in TileMapLayer's inspector:

editor/scene/2d/tiles/tile_set_editor.cpp:244 - Condition "tile_set.is_null()" is true.

Comment thread editor/icons/TileMapDock.svg
@KoBeWi
Copy link
Copy Markdown
Member

KoBeWi commented Nov 22, 2025

On a side note, we might want a separate editor setting for bottom tabs style 🤔
image
EDIT:
#113065

Comment thread editor/scene/2d/tiles/tile_map_layer_editor.h Outdated
@lodetrick
Copy link
Copy Markdown
Contributor Author

I decided to not fix the TileSet issue in this PR. After a few hours of digging, I realized it was a bigger issue with docks in general and I'm going to submit a separate PR that fixes it.

Comment thread editor/scene/2d/tiles/tiles_editor_plugin.cpp
@KoBeWi KoBeWi modified the milestones: 4.x, 4.6 Nov 24, 2025
@Repiteo Repiteo merged commit 3d0f288 into godotengine:master Nov 24, 2025
20 checks passed
@Repiteo
Copy link
Copy Markdown
Contributor

Repiteo commented Nov 24, 2025

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants