godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Reset TileMapEditor painting on application refocus

Browse Source 
Treats application unfocus as a mouse release for
TOOL_PAINTING, by finishing the undo state and
resetting the tool. Also sets a flag to prevent extra
lines from being drawn when the application is refocused.

fixes #42398, fixes #24970
This commit is contained in:
Michael Auderer
2020-10-02 01:48:14 -04:00
parent 5e726d8d20
commit 70a4cd1afe
2 changed files with 26 additions and 0 deletions
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: { case NOTIFICATION_EXIT_TREE: {
get_tree()->disconnect("node_removed", callable_mp(this, &TileMapEditor::_node_removed)); get_tree()->disconnect("node_removed", callable_mp(this, &TileMapEditor::_node_removed));
} break; } 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(); 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); int tile_under = node->get_cell(over_tile.x, over_tile.y);
String tile_name = "none"; String tile_name = "none";

1
editor/plugins/tile_map_editor_plugin.h
View File

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