summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp22
-rw-r--r--editor/plugins/canvas_item_editor_plugin.h1
2 files changed, 22 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index cbb983172f..1fd343c4b8 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -775,6 +775,24 @@ CanvasItemEditor::DragType CanvasItemEditor::_get_resize_handle_drag_type(const
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) {
ERR_FAIL_COND_V(!p_control, Vector2());
@@ -1319,6 +1337,7 @@ void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) {
if (b) {
bool ik_found = false;
+
bool first = true;
while (b) {
@@ -1563,10 +1582,11 @@ void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) {
Control *control = canvas_item->cast_to<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));
+ anchor = _anchor_snap(anchor);
switch (drag) {
- // Handles anchor dragging
case DRAG_ANCHOR_TOP_LEFT:
control->set_anchor(MARGIN_LEFT, anchor.x);
control->set_anchor(MARGIN_TOP, anchor.y);
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h
index fd89a451e1..0263bc1083 100644
--- a/editor/plugins/canvas_item_editor_plugin.h
+++ b/editor/plugins/canvas_item_editor_plugin.h
@@ -334,6 +334,7 @@ class CanvasItemEditor : public VBoxContainer {
void _prepare_drag(const Point2 &p_click_pos);
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 _position_to_anchor(Control *p_control, Vector2 position);