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

Merge pull request #55333 from pablodp606/fix-offset-drag 

Fix offset in CanvasItem drag movement
This commit is contained in:
Rémi Verschelde 2021-11-27 09:16:16 +01:00 committed by GitHub
parent e734a7a2d8 cfacd9c057
commit 52b7d5fa34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -2339,7 +2339,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
if (selection2.size() > 0) { if (selection2.size() > 0) {
drag_type = DRAG_MOVE; drag_type = DRAG_MOVE;
drag_from = click; drag_from = drag_start_origin;
_save_canvas_item_state(drag_selection); _save_canvas_item_state(drag_selection);
} }
return true; return true;

2
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -1749,7 +1749,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
} else { } else {
const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE; const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE;
if (clicked.is_valid() && movement_threshold_passed) { if (clicked.is_valid() && movement_threshold_passed) {
_compute_edit(_edit.mouse_pos); _compute_edit(_edit.original_mouse_pos);
clicked = ObjectID(); clicked = ObjectID();
_edit.mode = TRANSFORM_TRANSLATE; _edit.mode = TRANSFORM_TRANSLATE;