diff options
| author | Gilles Roudiere | 2017-07-17 23:28:19 +0200 |
|---|---|---|
| committer | Gilles Roudiere | 2017-07-20 19:50:37 +0200 |
| commit | 0d4b0ecb577a373458427a5c87a5cbe7e121d62c (patch) | |
| tree | cdbbf38254a5d108704664ca9956a82c9f9637d0 /editor/plugins/canvas_item_editor_plugin.h | |
| parent | 2a0c0db028c84c75f4a927d0fd400449f3236952 (diff) | |
| download | godot-0d4b0ecb577a373458427a5c87a5cbe7e121d62c.tar.gz godot-0d4b0ecb577a373458427a5c87a5cbe7e121d62c.tar.zst godot-0d4b0ecb577a373458427a5c87a5cbe7e121d62c.zip | |
Generalized _find_canvas_items_at_pos to remove _select_canvas_items_at_pos
Removed some useless parameters
Removed old comments
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.h')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index f40a7cbc4..bd5349485 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -303,8 +303,7 @@ class CanvasItemEditor : public VBoxContainer { int handle_len; bool _is_part_of_subscene(CanvasItem *p_item); - CanvasItem *_select_canvas_item_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform); - void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, Vector<_SelectResult> &r_items); + void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, Vector<_SelectResult> &r_items, unsigned int limit = 0); void _find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, List<CanvasItem *> *r_items); bool _select(CanvasItem *item, Point2 p_click_pos, bool p_append, bool p_drag = true); @@ -325,7 +324,7 @@ class CanvasItemEditor : public VBoxContainer { void _key_move(const Vector2 &p_dir, bool p_snap, KeyMoveMODE p_move_mode); void _list_select(const Ref<InputEventMouseButton> &b); - DragType _find_drag_type(const Transform2D &p_xform, const Rect2 &p_local_rect, const Point2 &p_click, Vector2 &r_point); + DragType _find_drag_type(const Point2 &p_click, Vector2 &r_point); void _prepare_drag(const Point2 &p_click_pos); void _popup_callback(int p_op); |