godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60111 from KoBeWi/the_files_have_landed

Browse Source
This commit is contained in:
Rémi Verschelde 2022-04-11 12:52:51 +02:00 committed by GitHub
commit 2ec68599a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/classes/Window.xml
View File

@ -349,6 +349,15 @@
<argument index="0" name="files" type="PackedStringArray" /> <argument index="0" name="files" type="PackedStringArray" />
<description> <description>
Emitted when files are dragged from the OS file manager and dropped in the game window. The argument is a list of file paths. Emitted when files are dragged from the OS file manager and dropped in the game window. The argument is a list of file paths.
Note that this method only works with non-embedded windows, i.e. the main window and [Window]-derived nodes when [member Viewport.gui_embed_subwindows] is disabled in the main viewport.
Example usage:
[codeblock]
func _ready():
get_viewport().files_dropped.connect(on_files_dropped)
func on_files_dropped(files):
print(files)
[/codeblock]
</description> </description>
</signal> </signal>
<signal name="focus_entered"> <signal name="focus_entered">

2
editor/editor_node.cpp
View File

@ -5478,7 +5478,7 @@ void EditorNode::_global_menu_new_window(const Variant &p_tag) {
} }
} }
void EditorNode::_dropped_files(const Vector<String> &p_files, int p_screen) { void EditorNode::_dropped_files(const Vector<String> &p_files) {
String to_path = ProjectSettings::get_singleton()->globalize_path(FileSystemDock::get_singleton()->get_selected_path()); String to_path = ProjectSettings::get_singleton()->globalize_path(FileSystemDock::get_singleton()->get_selected_path());
_add_dropped_files_recursive(p_files, to_path); _add_dropped_files_recursive(p_files, to_path);

2
editor/editor_node.h
View File

@ -575,7 +575,7 @@ private:
void _open_recent_scene(int p_idx); void _open_recent_scene(int p_idx);
void _global_menu_scene(const Variant &p_tag); void _global_menu_scene(const Variant &p_tag);
void _global_menu_new_window(const Variant &p_tag); void _global_menu_new_window(const Variant &p_tag);
void _dropped_files(const Vector<String> &p_files, int p_screen); void _dropped_files(const Vector<String> &p_files);
void _add_dropped_files_recursive(const Vector<String> &p_files, String to_path); void _add_dropped_files_recursive(const Vector<String> &p_files, String to_path);
void _update_from_settings(); void _update_from_settings();

2
editor/project_manager.cpp
View File

@ -2402,7 +2402,7 @@ void ProjectManager::_install_project(const String &p_zip_path, const String &p_
npdialog->show_dialog(); npdialog->show_dialog();
} }
void ProjectManager::_files_dropped(PackedStringArray p_files, int p_screen) { void ProjectManager::_files_dropped(PackedStringArray p_files) {
if (p_files.size() == 1 && p_files[0].ends_with(".zip")) { if (p_files.size() == 1 && p_files[0].ends_with(".zip")) {
const String file = p_files[0].get_file(); const String file = p_files[0].get_file();
_install_project(p_files[0], file.substr(0, file.length() - 4).capitalize()); _install_project(p_files[0], file.substr(0, file.length() - 4).capitalize());

2
editor/project_manager.h
View File

@ -127,7 +127,7 @@ class ProjectManager : public Control {
void _dim_window(); void _dim_window();
virtual void shortcut_input(const Ref<InputEvent> &p_ev) override; virtual void shortcut_input(const Ref<InputEvent> &p_ev) override;
void _files_dropped(PackedStringArray p_files, int p_screen); void _files_dropped(PackedStringArray p_files);
void _version_button_pressed(); void _version_button_pressed();
void _on_order_option_changed(int p_idx); void _on_order_option_changed(int p_idx);

2
scene/main/window.cpp
View File

@ -981,7 +981,7 @@ void Window::_window_input_text(const String &p_text) {
} }
void Window::_window_drop_files(const Vector<String> &p_files) { void Window::_window_drop_files(const Vector<String> &p_files) {
emit_signal(SNAME("files_dropped"), p_files, current_screen); emit_signal(SNAME("files_dropped"), p_files);
} }
Viewport *Window::get_parent_viewport() const { Viewport *Window::get_parent_viewport() const {