Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #59081 from Sauermann/fix-cursorshape-canvasitemeditor

Browse source 
Use get_cursor_shape for identifying the cursor shape in CanvasItemEditor
This commit is contained in:
Rémi Verschelde 2023-01-23 12:26:35 +01:00
commit d065281bc0
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/canvas_item_editor_plugin.h
View file

@ -368,7 +368,7 @@ private:
void _pan_callback(Vector2 p_scroll_vec);
void _zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin, bool p_alt);
bool _is_node_locked(const Node *p_node);
bool _is_node_locked(const Node *p_node) const;
bool _is_node_movable(const Node *p_node, bool p_popup_warning = false);
void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<_SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
void _get_canvas_items_at_pos(const Point2 &p_pos, Vector<_SelectResult> &r_items, bool p_allow_locked = false);
@ -402,7 +402,7 @@ private:
void _prepare_grid_menu();
void _on_grid_menu_id_pressed(int p_id);
List<CanvasItem *> _get_edited_canvas_items(bool retrieve_locked = false, bool remove_canvas_item_if_parent_in_selection = true);
List<CanvasItem *> _get_edited_canvas_items(bool retrieve_locked = false, bool remove_canvas_item_if_parent_in_selection = true) const;
Rect2 _get_encompassing_rect_from_list(List<CanvasItem *> p_list);
void _expand_encompassing_rect_using_children(Rect2 &r_rect, const Node *p_node, bool &r_first, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D(), bool include_locked_nodes = true);
Rect2 _get_encompassing_rect(const Node *p_node);
@ -552,6 +552,8 @@ public:
void focus_selection();
void center_at(const Point2 &p_pos);
virtual CursorShape get_cursor_shape(const Point2 &p_pos) const override;
EditorSelection *editor_selection = nullptr;
CanvasItemEditor();