mirror of
https://github.com/godotengine/godot.git
synced 2025-12-07 22:00:10 +00:00
Change preview methods to take Callable
This commit is contained in:
parent
aa2c4fe654
commit
eae9ef2292
15 changed files with 76 additions and 113 deletions
|
|
@ -511,7 +511,7 @@ void EditorFileDialog::_post_popup() {
|
|||
set_process_shortcut_input(true);
|
||||
}
|
||||
|
||||
void EditorFileDialog::_thumbnail_result(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, const Variant &p_udata) {
|
||||
void EditorFileDialog::_thumbnail_result(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview) {
|
||||
if (display_mode == DISPLAY_LIST || p_preview.is_null()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -526,7 +526,7 @@ void EditorFileDialog::_thumbnail_result(const String &p_path, const Ref<Texture
|
|||
}
|
||||
}
|
||||
|
||||
void EditorFileDialog::_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, const Variant &p_udata) {
|
||||
void EditorFileDialog::_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview) {
|
||||
set_process(false);
|
||||
preview_waiting = false;
|
||||
|
||||
|
|
@ -552,7 +552,7 @@ void EditorFileDialog::_request_single_thumbnail(const String &p_path) {
|
|||
set_process(true);
|
||||
preview_waiting = true;
|
||||
preview_wheel_timeout = 0;
|
||||
EditorResourcePreview::get_singleton()->queue_resource_preview(p_path, this, "_thumbnail_done", p_path);
|
||||
EditorResourcePreview::get_singleton()->queue_resource_preview(p_path, callable_mp(this, &EditorFileDialog::_thumbnail_done));
|
||||
}
|
||||
|
||||
void EditorFileDialog::_action_pressed() {
|
||||
|
|
@ -1173,7 +1173,7 @@ void EditorFileDialog::update_file_list() {
|
|||
item_list->set_item_metadata(-1, d);
|
||||
|
||||
if (display_mode == DISPLAY_THUMBNAILS && previews_enabled) {
|
||||
EditorResourcePreview::get_singleton()->queue_resource_preview(file_info.path, this, "_thumbnail_result", file_info.path);
|
||||
EditorResourcePreview::get_singleton()->queue_resource_preview(file_info.path, callable_mp(this, &EditorFileDialog::_thumbnail_result));
|
||||
}
|
||||
|
||||
if (file->get_text() == file_info.name) {
|
||||
|
|
@ -2172,10 +2172,8 @@ void EditorFileDialog::_bind_methods() {
|
|||
ClassDB::bind_method(D_METHOD("get_access"), &EditorFileDialog::get_access);
|
||||
ClassDB::bind_method(D_METHOD("set_show_hidden_files", "show"), &EditorFileDialog::set_show_hidden_files);
|
||||
ClassDB::bind_method(D_METHOD("is_showing_hidden_files"), &EditorFileDialog::is_showing_hidden_files);
|
||||
ClassDB::bind_method(D_METHOD("_thumbnail_done"), &EditorFileDialog::_thumbnail_done);
|
||||
ClassDB::bind_method(D_METHOD("set_display_mode", "mode"), &EditorFileDialog::set_display_mode);
|
||||
ClassDB::bind_method(D_METHOD("get_display_mode"), &EditorFileDialog::get_display_mode);
|
||||
ClassDB::bind_method(D_METHOD("_thumbnail_result"), &EditorFileDialog::_thumbnail_result);
|
||||
ClassDB::bind_method(D_METHOD("set_disable_overwrite_warning", "disable"), &EditorFileDialog::set_disable_overwrite_warning);
|
||||
ClassDB::bind_method(D_METHOD("is_overwrite_warning_disabled"), &EditorFileDialog::is_overwrite_warning_disabled);
|
||||
ClassDB::bind_method(D_METHOD("add_side_menu", "menu", "title"), &EditorFileDialog::add_side_menu, DEFVAL(""));
|
||||
|
|
|
|||
|
|
@ -272,8 +272,8 @@ private:
|
|||
void _save_to_recent();
|
||||
// Callback function is callback(String p_path,Ref<Texture2D> preview,Variant udata) preview null if could not load.
|
||||
|
||||
void _thumbnail_result(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, const Variant &p_udata);
|
||||
void _thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, const Variant &p_udata);
|
||||
void _thumbnail_result(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview);
|
||||
void _thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview);
|
||||
void _request_single_thumbnail(const String &p_path);
|
||||
|
||||
virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue