diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-01-19 20:27:27 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-19 20:28:20 -0300 |
commit | 891e31b139b269fb154d30b8c7d7887267708d8b (patch) | |
tree | 65e3c85540d003200592dd2847fe148bee01ad7d /scene/main/viewport.h | |
parent | d67df42cc864c3bc5cd1911406e284c3cb84f8e8 (diff) |
-Some fixes to drag and drop and canvas offset for GUI that were introduced after rewrite
Diffstat (limited to 'scene/main/viewport.h')
-rw-r--r-- | scene/main/viewport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 50e1f0e0f0..89e053d607 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -246,8 +246,8 @@ friend class Control; void _gui_remove_control(Control *p_control); void _gui_hid_control(Control *p_control); - void _gui_force_drag(const Variant& p_data,Control *p_control); - void _gui_set_drag_preview(Control *p_control); + void _gui_force_drag(Control *p_base,const Variant& p_data,Control *p_control); + void _gui_set_drag_preview(Control *p_base,Control *p_control); bool _gui_is_modal_on_top(const Control* p_control); List<Control*>::Element* _gui_show_modal(Control* p_control); |