mirror of
https://github.com/godotengine/godot
synced 2024-09-05 08:08:29 +00:00
Allow non-control Nodes to handle drag forwarding (e.g. Windows)
This commit is contained in:
parent
8be97e3b51
commit
4baddc1126
|
@ -742,7 +742,7 @@ bool Control::has_point(const Point2 &p_point) const {
|
|||
return Rect2(Point2(), get_size()).has_point(p_point);
|
||||
}
|
||||
|
||||
void Control::set_drag_forwarding(Control *p_target) {
|
||||
void Control::set_drag_forwarding(Node *p_target) {
|
||||
if (p_target) {
|
||||
data.drag_owner = p_target->get_instance_id();
|
||||
} else {
|
||||
|
@ -754,8 +754,7 @@ Variant Control::get_drag_data(const Point2 &p_point) {
|
|||
if (data.drag_owner.is_valid()) {
|
||||
Object *obj = ObjectDB::get_instance(data.drag_owner);
|
||||
if (obj) {
|
||||
Control *c = Object::cast_to<Control>(obj);
|
||||
return c->call("_get_drag_data_fw", p_point, this);
|
||||
return obj->call("_get_drag_data_fw", p_point, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -771,8 +770,7 @@ bool Control::can_drop_data(const Point2 &p_point, const Variant &p_data) const
|
|||
if (data.drag_owner.is_valid()) {
|
||||
Object *obj = ObjectDB::get_instance(data.drag_owner);
|
||||
if (obj) {
|
||||
Control *c = Object::cast_to<Control>(obj);
|
||||
return c->call("_can_drop_data_fw", p_point, p_data, this);
|
||||
return obj->call("_can_drop_data_fw", p_point, p_data, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -787,8 +785,7 @@ void Control::drop_data(const Point2 &p_point, const Variant &p_data) {
|
|||
if (data.drag_owner.is_valid()) {
|
||||
Object *obj = ObjectDB::get_instance(data.drag_owner);
|
||||
if (obj) {
|
||||
Control *c = Object::cast_to<Control>(obj);
|
||||
c->call("_drop_data_fw", p_point, p_data, this);
|
||||
obj->call("_drop_data_fw", p_point, p_data, this);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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(Control *p_target);
|
||||
virtual void set_drag_forwarding(Node *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);
|
||||
|
|
Loading…
Reference in a new issue