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

Allow dragging on only one (global) axis when holding down shift 

Closes #1723

(cherry picked from commit d82ff4ed09)
This commit is contained in:
Bojidar Marinov 2016-04-29 15:06:29 +03:00 committed by Rémi Verschelde
parent 4228505cf0
commit 70644301dd
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -1578,8 +1578,21 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
} }
bool uniform = m.mod.shift;
bool symmetric=m.mod.alt;
dto = dto - (drag == DRAG_ALL ? drag_from - drag_point_from : Vector2(0, 0));
if(uniform && drag == DRAG_ALL) {
if(ABS(dto.x - drag_point_from.x) > ABS(dto.y - drag_point_from.y)) {
dto.y = drag_point_from.y;
} else {
dto.x = drag_point_from.x;
}
}
dfrom = drag_point_from; dfrom = drag_point_from;
dto = snap_point(dto - (drag == DRAG_ALL ? drag_from - drag_point_from : Vector2(0, 0)), drag_point_from); dto = snap_point(dto, drag_point_from);
Vector2 drag_vector = Vector2 drag_vector =
canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dto) - canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dto) -
@ -1589,8 +1602,6 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
Vector2 begin=local_rect.pos; Vector2 begin=local_rect.pos;
Vector2 end=local_rect.pos+local_rect.size; Vector2 end=local_rect.pos+local_rect.size;
Vector2 minsize = canvas_item->edit_get_minimum_size(); Vector2 minsize = canvas_item->edit_get_minimum_size();
bool uniform = m.mod.shift;
bool symmetric=m.mod.alt;
if (uniform) { if (uniform) {
float aspect = local_rect.size.get_aspect(); float aspect = local_rect.size.get_aspect();