maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #42489 from auderer/tilemapeditor-refocus

Browse source 
Reset TileMapEditor painting state on application refocus
This commit is contained in:
Rémi Verschelde 2020-10-13 10:00:04 +02:00 committed by GitHub
parent 36e51a8d7e 6d510453e5
commit 1aa8f356e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
editor/plugins/tile_map_editor_plugin.cpp
View file

@ -89,6 +89,25 @@ void TileMapEditor::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: {
get_tree()->disconnect("node_removed", callable_mp(this, &TileMapEditor::_node_removed));
} break;
case NOTIFICATION_APPLICATION_FOCUS_OUT: {
if (tool == TOOL_PAINTING) {
Vector<int> ids = get_selected_tiles();
if (ids.size() > 0 && ids[0] != TileMap::INVALID_CELL) {
_set_cell(over_tile, ids, flip_h, flip_v, transpose);
_finish_undo();
paint_undo.clear();
}
tool = TOOL_NONE;
_update_button_tool();
}
// set flag to ignore over_tile on refocus
refocus_over_tile = true;
} break;
}
}
@ -1299,6 +1318,12 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
CanvasItemEditor::get_singleton()->update_viewport();
}
if (refocus_over_tile) {
// editor lost focus; forget last tile position
old_over_tile = new_over_tile;
refocus_over_tile = false;
}
int tile_under = node->get_cell(over_tile.x, over_tile.y);
String tile_name = "none";

1
editor/plugins/tile_map_editor_plugin.h
View file

@ -119,6 +119,7 @@ class TileMapEditor : public VBoxContainer {
Rect2i rectangle;
Point2i over_tile;
bool refocus_over_tile = false;
bool *bucket_cache_visited;
Rect2i bucket_cache_rect;