diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-14 21:53:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 21:53:26 +0200 |
| commit | af5c30acb2eee54ce78e3dc713eea97bd3ddc18d (patch) | |
| tree | eb8d7548c7d4a7ffb817067ff4f99e5bb599b3b0 | |
| parent | f7a6709f5ea809dded8c1c660aeaa01eab745c1e (diff) | |
| parent | 585ad5c8eabb74449b8e1215b2ac921a3e44ca1d (diff) | |
Merge pull request #22080 from YeldhamDev/expose_get_top_modal_stack
Expose "get_modal_stack_top()" to GDScript
| -rw-r--r-- | doc/classes/Viewport.xml | 7 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml index 2f5710da51..9cd501630e 100644 --- a/doc/classes/Viewport.xml +++ b/doc/classes/Viewport.xml @@ -46,6 +46,13 @@ Returns the total transform of the viewport. </description> </method> + <method name="get_modal_stack_top" qualifiers="const"> + <return type="Control"> + </return> + <description> + Returns the topmost modal in the stack. + </description> + </method> <method name="get_mouse_position" qualifiers="const"> <return type="Vector2"> </return> diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index dfd9dfa52e..487ca2b009 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2789,6 +2789,8 @@ void Viewport::_bind_methods() { ClassDB::bind_method(D_METHOD("gui_get_drag_data"), &Viewport::gui_get_drag_data); ClassDB::bind_method(D_METHOD("gui_is_dragging"), &Viewport::gui_is_dragging); + ClassDB::bind_method(D_METHOD("get_modal_stack_top"), &Viewport::get_modal_stack_top); + ClassDB::bind_method(D_METHOD("set_disable_input", "disable"), &Viewport::set_disable_input); ClassDB::bind_method(D_METHOD("is_input_disabled"), &Viewport::is_input_disabled); |