diff options
| author | Gilles Roudière <gilles.roudiere@gmail.com> | 2021-10-19 13:13:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 13:13:46 +0200 |
| commit | bc0b7028742fbb337d7549f49460a726fb2930b4 (patch) | |
| tree | badb8e7017c6f74501e2cd2e2a046a87467ed982 /scene/gui | |
| parent | b1b5d516d70be512b657eebcef78210267fbd862 (diff) | |
| parent | 1a95f893c4ed4d4ac872a294c64d06ee70fa10bd (diff) | |
Merge pull request #53440 from groud/tile_map_patterns_palette
Implement TileMap patterns palette
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/control.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 38da40a402..973074397b 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -740,7 +740,7 @@ bool Control::has_point(const Point2 &p_point) const { return Rect2(Point2(), get_size()).has_point(p_point); } -void Control::set_drag_forwarding(Node *p_target) { +void Control::set_drag_forwarding(Object *p_target) { if (p_target) { data.drag_owner = p_target->get_instance_id(); } else { diff --git a/scene/gui/control.h b/scene/gui/control.h index be692b6a0c..b551a2e299 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -355,7 +355,7 @@ public: virtual Size2 get_minimum_size() const; virtual Size2 get_combined_minimum_size() const; virtual bool has_point(const Point2 &p_point) const; - virtual void set_drag_forwarding(Node *p_target); + virtual void set_drag_forwarding(Object *p_target); virtual Variant get_drag_data(const Point2 &p_point); virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const; virtual void drop_data(const Point2 &p_point, const Variant &p_data); |