maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11814 from groud/fix_draw_pre_drag_rect

Browse source 
Fixes the Control pre-drag rect not drawn correctly
This commit is contained in:
Andreas Haas 2017-10-06 13:20:37 +02:00 committed by GitHub
parent fd1d886cf8 3f279d2a3e
commit 3926c9e893
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -990,6 +990,7 @@ void CanvasItemEditor::_prepare_drag(const Point2 &p_click_pos) {
se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset();
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
se->pre_drag_rect = canvas_item->get_item_rect();
}
if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0])) {
@ -1517,6 +1518,7 @@ void CanvasItemEditor::_viewport_base_gui_input(const Ref<InputEvent> &p_event)
if (Object::cast_to<Control>(canvas_item))
se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset();
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
se->pre_drag_rect = canvas_item->get_item_rect();
return;
}
@ -1539,6 +1541,7 @@ void CanvasItemEditor::_viewport_base_gui_input(const Ref<InputEvent> &p_event)
if (Object::cast_to<Control>(canvas_item))
se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset();
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
se->pre_drag_rect = canvas_item->get_item_rect();
return;
}
@ -1550,6 +1553,7 @@ void CanvasItemEditor::_viewport_base_gui_input(const Ref<InputEvent> &p_event)
drag_from = transform.affine_inverse().xform(click);
se->undo_state = canvas_item->edit_get_state();
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
se->pre_drag_rect = canvas_item->get_item_rect();
return;
}
}
@ -2206,16 +2210,16 @@ void CanvasItemEditor::_draw_selection() {
Rect2 rect = canvas_item->get_item_rect();
if (drag != DRAG_NONE && drag != DRAG_PIVOT) {
if (show_helpers && drag != DRAG_NONE && drag != DRAG_PIVOT) {
const Transform2D pre_drag_xform = transform * se->pre_drag_xform;
const Color pre_drag_color = Color(0.4, 0.6, 1, 0.7);
Vector2 pre_drag_endpoints[4] = {
pre_drag_xform.xform(rect.position),
pre_drag_xform.xform(rect.position + Vector2(rect.size.x, 0)),
pre_drag_xform.xform(rect.position + rect.size),
pre_drag_xform.xform(rect.position + Vector2(0, rect.size.y))
pre_drag_xform.xform(se->pre_drag_rect.position),
pre_drag_xform.xform(se->pre_drag_rect.position + Vector2(se->pre_drag_rect.size.x, 0)),
pre_drag_xform.xform(se->pre_drag_rect.position + se->pre_drag_rect.size),
pre_drag_xform.xform(se->pre_drag_rect.position + Vector2(0, se->pre_drag_rect.size.y))
};
for (int i = 0; i < 4; i++) {

1
editor/plugins/canvas_item_editor_plugin.h
View file

@ -59,6 +59,7 @@ public:
float prev_anchors[4];
Transform2D pre_drag_xform;
Rect2 pre_drag_rect;
CanvasItemEditorSelectedItem() { prev_rot = 0; }
};