godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Snap anchors when dragged, depending on the zoom level

Browse Source
This commit is contained in:
Gilles Roudiere
2017-07-30 15:32:22 +02:00
parent fcff42dcb7
commit b329cb9c71
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -775,6 +775,24 @@ CanvasItemEditor::DragType CanvasItemEditor::_get_resize_handle_drag_type(const
return DRAG_NONE; return DRAG_NONE;
} }
Vector2 CanvasItemEditor::_anchor_snap(Vector2 anchor) {
float radius = 0.05 / zoom;
if (fabs(anchor.x - ANCHOR_BEGIN) < radius) {
anchor.x = ANCHOR_BEGIN;
} else if (fabs(anchor.x - ANCHOR_CENTER) < radius) {
anchor.x = ANCHOR_CENTER;
} else if (fabs(anchor.x - ANCHOR_END) < radius) {
anchor.x = ANCHOR_END;
}
if (fabs(anchor.y - ANCHOR_BEGIN) < radius) {
anchor.y = ANCHOR_BEGIN;
} else if (fabs(anchor.y - ANCHOR_CENTER) < radius) {
anchor.y = ANCHOR_CENTER;
} else if (fabs(anchor.y - ANCHOR_END) < radius) {
anchor.y = ANCHOR_END;
}
return anchor;
}
Vector2 CanvasItemEditor::_anchor_to_position(Control *p_control, Vector2 anchor) { Vector2 CanvasItemEditor::_anchor_to_position(Control *p_control, Vector2 anchor) {
ERR_FAIL_COND_V(!p_control, Vector2()); ERR_FAIL_COND_V(!p_control, Vector2());
@@ -1319,6 +1337,7 @@ void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) {
if (b) { if (b) {
bool ik_found = false; bool ik_found = false;
bool first = true; bool first = true;
while (b) { while (b) {
@@ -1563,10 +1582,11 @@ void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) {
Control *control = canvas_item->cast_to<Control>(); Control *control = canvas_item->cast_to<Control>();
if (control) { if (control) {
// Drag and snap the anchor
Vector2 anchor = _position_to_anchor(control, canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dto - drag_from + drag_point_from)); Vector2 anchor = _position_to_anchor(control, canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dto - drag_from + drag_point_from));
anchor = _anchor_snap(anchor);
switch (drag) { switch (drag) {
// Handles anchor dragging
case DRAG_ANCHOR_TOP_LEFT: case DRAG_ANCHOR_TOP_LEFT:
control->set_anchor(MARGIN_LEFT, anchor.x); control->set_anchor(MARGIN_LEFT, anchor.x);
control->set_anchor(MARGIN_TOP, anchor.y); control->set_anchor(MARGIN_TOP, anchor.y);

1
editor/plugins/canvas_item_editor_plugin.h
View File

@@ -334,6 +334,7 @@ class CanvasItemEditor : public VBoxContainer {
void _prepare_drag(const Point2 &p_click_pos); void _prepare_drag(const Point2 &p_click_pos);
DragType _get_anchor_handle_drag_type(const Point2 &p_click, Vector2 &r_point); DragType _get_anchor_handle_drag_type(const Point2 &p_click, Vector2 &r_point);
Vector2 _anchor_snap(Vector2 anchor);
Vector2 _anchor_to_position(Control *p_control, Vector2 anchor); Vector2 _anchor_to_position(Control *p_control, Vector2 anchor);
Vector2 _position_to_anchor(Control *p_control, Vector2 position); Vector2 _position_to_anchor(Control *p_control, Vector2 position);