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

Merge pull request #436 from marynate/PR-2d-uniform-scale

Browse Source 
Add 2d unifrom scale
This commit is contained in:
reduz
2014-05-20 23:10:45 -03:00
parent 27ee218e3d 9737c02e21
commit 8bb7cc7325
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1058,7 +1058,8 @@ 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 symmetric=m.mod.shift; bool uniform = m.mod.shift;
bool symmetric=m.mod.alt;
switch(drag) { switch(drag) {
@@ -1078,10 +1079,19 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
} break; } break;
case DRAG_BOTTOM_RIGHT: { 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.x,end.x,drag_vector.x,minsize.x,symmetric);
incend(begin.y,end.y,drag_vector.y,minsize.y,symmetric); incend(begin.y,end.y,drag_vector.y,minsize.y,symmetric);
} break; } break;
case DRAG_TOP_LEFT: { 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.x,end.x,drag_vector.x,minsize.x,symmetric);
incbeg(begin.y,end.y,drag_vector.y,minsize.y,symmetric); incbeg(begin.y,end.y,drag_vector.y,minsize.y,symmetric);
} break; } break;
@@ -1097,12 +1107,20 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
} break; } break;
case DRAG_TOP_RIGHT: { 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); incbeg(begin.y,end.y,drag_vector.y,minsize.y,symmetric);
incend(begin.x,end.x,drag_vector.x,minsize.x,symmetric); incend(begin.x,end.x,drag_vector.x,minsize.x,symmetric);
} break; } break;
case DRAG_BOTTOM_LEFT: { 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); incbeg(begin.x,end.x,drag_vector.x,minsize.x,symmetric);
incend(begin.y,end.y,drag_vector.y,minsize.y,symmetric); incend(begin.y,end.y,drag_vector.y,minsize.y,symmetric);
} break; } break;