diff options
| author | Rémi Verschelde | 2017-10-20 12:42:35 +0200 |
|---|---|---|
| committer | GitHub | 2017-10-20 12:42:35 +0200 |
| commit | 84251d7aec34709d9ab89390e9576a05ab925127 (patch) | |
| tree | f455d3f6e614904189df9365866ff5ffd2da4fb1 /editor/plugins/collision_shape_2d_editor_plugin.h | |
| parent | 3517e791cef631318880c68a5712aebfa7eaec49 (diff) | |
| parent | 907970aab69689b4c37ced90548c42b01664102e (diff) | |
| download | godot-84251d7aec34709d9ab89390e9576a05ab925127.tar.gz godot-84251d7aec34709d9ab89390e9576a05ab925127.tar.zst godot-84251d7aec34709d9ab89390e9576a05ab925127.zip | |
Merge pull request #12195 from groud/fix_snapping
Fix snapping with 2D nodes
[ci skip]
Diffstat (limited to 'editor/plugins/collision_shape_2d_editor_plugin.h')
| -rw-r--r-- | editor/plugins/collision_shape_2d_editor_plugin.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index ffa91952e..d4fbe87fb 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -68,13 +68,13 @@ class CollisionShape2DEditor : public Control { void commit_handle(int idx, Variant &p_org); void _get_current_shape_type(); - void _canvas_draw(); protected: static void _bind_methods(); public: - bool forward_gui_input(const Ref<InputEvent> &p_event); + bool forward_canvas_gui_input(const Ref<InputEvent> &p_event); + void forward_draw_over_canvas(Control *p_canvas); void edit(Node *p_node); CollisionShape2DEditor(EditorNode *p_editor); @@ -87,7 +87,8 @@ class CollisionShape2DEditorPlugin : public EditorPlugin { EditorNode *editor; public: - virtual bool forward_canvas_gui_input(const Transform2D &p_canvas_xform, const Ref<InputEvent> &p_event) { return collision_shape_2d_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) { return collision_shape_2d_editor->forward_canvas_gui_input(p_event); } + virtual void forward_draw_over_canvas(Control *p_canvas) { return collision_shape_2d_editor->forward_draw_over_canvas(p_canvas); } virtual String get_name() const { return "CollisionShape2D"; } bool has_main_screen() const { return false; } |