diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-03-24 20:15:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:46 +0100 |
| commit | 9a5d15a2dcb08aa9f3732a0e8e41f2e81c2be365 (patch) | |
| tree | 1de67674b96aa82e3b4fc33bcc394a545d4f639c /scene/main/window.cpp | |
| parent | 047e0b7de5ca981d955739074919646fade828fb (diff) | |
| download | redot-engine-9a5d15a2dcb08aa9f3732a0e8e41f2e81c2be365.tar.gz | |
Implemented drag and drop across windows, both OS and embedded.
Diffstat (limited to 'scene/main/window.cpp')
| -rw-r--r-- | scene/main/window.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index ea6d4a46bd..f8a86b0957 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -228,6 +228,7 @@ void Window::_make_window() { DisplayServer::get_singleton()->window_set_max_size(max_size, window_id); DisplayServer::get_singleton()->window_set_min_size(min_size, window_id); DisplayServer::get_singleton()->window_set_title(title, window_id); + DisplayServer::get_singleton()->window_attach_instance_id(get_instance_id(), window_id); _update_window_size(); @@ -715,6 +716,7 @@ void Window::_notification(int p_what) { //it's the root window! visible = true; //always visible window_id = DisplayServer::MAIN_WINDOW_ID; + DisplayServer::get_singleton()->window_attach_instance_id(get_instance_id(), window_id); _update_from_window(); //since this window already exists (created on start), we must update pos and size from it { @@ -869,7 +871,6 @@ void Window::child_controls_changed() { } void Window::_window_input(const Ref<InputEvent> &p_ev) { - if (Engine::get_singleton()->is_editor_hint() && (Object::cast_to<InputEventJoypadButton>(p_ev.ptr()) || Object::cast_to<InputEventJoypadMotion>(*p_ev))) return; //avoid joy input on editor |