diff options
| author | reduz <reduzio@gmail.com> | 2014-05-20 23:10:45 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-05-20 23:10:45 -0300 |
| commit | 8bb7cc732563a3c23f13e88be92ccb29015fb391 (patch) | |
| tree | 8f264dbbf5873fa73d57c055b8f8229816b17daf /tools | |
| parent | 27ee218e3de322b1c19a303b731d616707b1366b (diff) | |
| parent | 9737c02e21202e22da672b546fb64c620aa56f18 (diff) | |
Merge pull request #436 from marynate/PR-2d-uniform-scale
Add 2d unifrom scale
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 880cc9c147..5f87b791f7 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -1058,7 +1058,8 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) { Vector2 begin=local_rect.pos; Vector2 end=local_rect.pos+local_rect.size; Vector2 minsize = canvas_item->edit_get_minimum_size(); - bool symmetric=m.mod.shift; + bool uniform = m.mod.shift; + bool symmetric=m.mod.alt; switch(drag) { @@ -1078,10 +1079,19 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) { } break; case DRAG_BOTTOM_RIGHT: { + if (uniform) { + drag_vector.y=drag_vector.x; + minsize.y=minsize.x; + } incend(begin.x,end.x,drag_vector.x,minsize.x,symmetric); incend(begin.y,end.y,drag_vector.y,minsize.y,symmetric); - } break; + } break; case DRAG_TOP_LEFT: { + + if (uniform) { + drag_vector.y=drag_vector.x; + minsize.y=minsize.x; + } incbeg(begin.x,end.x,drag_vector.x,minsize.x,symmetric); incbeg(begin.y,end.y,drag_vector.y,minsize.y,symmetric); } break; @@ -1097,12 +1107,20 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) { } break; case DRAG_TOP_RIGHT: { + if (uniform) { + drag_vector.x=-drag_vector.y; + minsize.x=minsize.y; + } incbeg(begin.y,end.y,drag_vector.y,minsize.y,symmetric); incend(begin.x,end.x,drag_vector.x,minsize.x,symmetric); } break; case DRAG_BOTTOM_LEFT: { + if (uniform) { + drag_vector.x=-drag_vector.y; + minsize.x=minsize.y; + } incbeg(begin.x,end.x,drag_vector.x,minsize.x,symmetric); incend(begin.y,end.y,drag_vector.y,minsize.y,symmetric); } break; |