godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79376 from kleonc/tiles-editor-tooltips

Browse Source 
[3.x] Improve `TileMap` editor visible names and tooltips
This commit is contained in:
Rémi Verschelde 2023-12-13 13:24:27 +01:00
commit 96bc1dc469
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
editor/plugins/tile_map_editor_plugin.cpp
View File

@ -402,21 +402,6 @@ void TileMapEditor::_sbox_input(const Ref<InputEvent> &p_ie) {
} }
} }
// Implementation detail of TileMapEditor::_update_palette();
// In modern C++ this could have been inside its body.
namespace {
struct _PaletteEntry {
int id;
String name;
bool operator<(const _PaletteEntry &p_rhs) const {
// Natural no case comparison will compare strings based on CharType
// order (except digits) and on numbers that start on the same position.
return name.naturalnocasecmp_to(p_rhs.name) < 0;
}
};
} // namespace
void TileMapEditor::_update_palette() { void TileMapEditor::_update_palette() {
if (!node) { if (!node) {
return; return;
@ -467,28 +452,40 @@ void TileMapEditor::_update_palette() {
String filter = search_box->get_text().strip_edges(); String filter = search_box->get_text().strip_edges();
struct _PaletteEntry {
int id;
String item_name;
bool operator<(const _PaletteEntry &p_rhs) const {
// Natural no case comparison will compare strings based on CharType
// order (except digits) and on numbers that start on the same position.
return item_name.naturalnocasecmp_to(p_rhs.item_name) < 0;
}
};
Vector<_PaletteEntry> entries; Vector<_PaletteEntry> entries;
for (List<int>::Element *E = tiles.front(); E; E = E->next()) { for (List<int>::Element *E = tiles.front(); E; E = E->next()) {
String name = tileset->tile_get_name(E->get()); int id = E->get();
if (name != "") { String item_name;
if (show_tile_ids) { if (show_tile_ids) {
if (sort_by_name) { item_name += "#" + itos(id);
name = name + " - " + itos(E->get()); }
} else { if (show_tile_names) {
name = itos(E->get()) + " - " + name; String tile_name = tileset->tile_get_name(id);
if (tile_name != "") {
if (item_name != "") {
item_name += " ";
} }
item_name += tile_name;
} }
} else {
name = "#" + itos(E->get());
} }
if (filter != "" && !filter.is_subsequence_ofi(name)) { if (filter != "" && !filter.is_subsequence_ofi(item_name)) {
continue; continue;
} }
const _PaletteEntry entry = { E->get(), name }; const _PaletteEntry entry = { id, item_name };
entries.push_back(entry); entries.push_back(entry);
} }
@ -497,11 +494,8 @@ void TileMapEditor::_update_palette() {
} }
for (int i = 0; i < entries.size(); i++) { for (int i = 0; i < entries.size(); i++) {
if (show_tile_names) { palette->add_item(entries[i].item_name);
palette->add_item(entries[i].name); palette->set_item_tooltip(palette->get_item_count() - 1, "ID = " + itos(entries[i].id) + "\nName = " + tileset->tile_get_name(entries[i].id));
} else {
palette->add_item(String());
}
Ref<Texture> tex = tileset->tile_get_texture(entries[i].id); Ref<Texture> tex = tileset->tile_get_texture(entries[i].id);
@ -568,6 +562,7 @@ void TileMapEditor::_update_palette() {
for (int i = 0; i < entries2.size(); i++) { for (int i = 0; i < entries2.size(); i++) {
manual_palette->add_item(String()); manual_palette->add_item(String());
manual_palette->set_item_tooltip(manual_palette->get_item_count() - 1, "Autotile Coords = (" + entries2[i].operator String() + ")");
if (tex.is_valid()) { if (tex.is_valid()) {
Rect2 region = tileset->tile_get_region(sel_tile); Rect2 region = tileset->tile_get_region(sel_tile);