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

Merge pull request #55445 from fazil47/master

Browse Source 
Right-clicking with copied tiles cancels it
This commit is contained in:
Gilles Roudière 2021-11-29 21:33:55 +01:00 committed by GitHub
commit aa74494ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/plugins/tiles/tile_map_editor.cpp
View File

@ -598,7 +598,10 @@ bool TileMapEditorTilesPlugin::forward_canvas_gui_input(const Ref<InputEvent> &p
} }
if (drag_type == DRAG_TYPE_CLIPBOARD_PASTE) { if (drag_type == DRAG_TYPE_CLIPBOARD_PASTE) {
// Do nothing. // Cancel tile pasting on right-click
if (mb->get_button_index() == MouseButton::RIGHT) {
drag_type = DRAG_TYPE_NONE;
}
} else if (tool_buttons_group->get_pressed_button() == select_tool_button) { } else if (tool_buttons_group->get_pressed_button() == select_tool_button) {
drag_start_mouse_pos = mpos; drag_start_mouse_pos = mpos;
if (tile_map_selection.has(tile_map->world_to_map(drag_start_mouse_pos)) && !mb->is_shift_pressed()) { if (tile_map_selection.has(tile_map->world_to_map(drag_start_mouse_pos)) && !mb->is_shift_pressed()) {