Skip to content

Fix inheriting from abstract classes dialog #109203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2025
Merged

Fix inheriting from abstract classes dialog #109203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions editor/gui/create_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const St
}
}

void CreateDialog::for_inherit() {
allow_abstract_scripts = true;
}

void CreateDialog::_fill_type_list() {
List<StringName> complete_type_list;
ClassDB::get_class_list(&complete_type_list);
Expand Down Expand Up @@ -222,7 +226,7 @@ bool CreateDialog::_should_hide_type(const StringName &p_type) const {
// Abstract scripts cannot be instantiated.
String path = ScriptServer::get_global_class_path(p_type);
Ref<Script> scr = ResourceLoader::load(path, "Script");
return scr.is_null() || scr->is_abstract();
return scr.is_null() || (!allow_abstract_scripts && scr->is_abstract());
}

return false;
Expand Down Expand Up @@ -363,7 +367,9 @@ void CreateDialog::_configure_search_option_item(TreeItem *r_item, const StringN
type_name = p_type;
text = p_type;

is_abstract = ScriptServer::is_global_class_abstract(p_type);
if (!allow_abstract_scripts) {
is_abstract = ScriptServer::is_global_class_abstract(p_type);
}

String tooltip = TTR("Script path: %s");
bool is_tool = ScriptServer::is_global_class_tool(p_type);
Expand Down Expand Up @@ -392,7 +398,7 @@ void CreateDialog::_configure_search_option_item(TreeItem *r_item, const StringN
r_item->set_metadata(0, meta);

bool can_instantiate = (p_type_category == TypeCategory::CPP_TYPE && ClassDB::can_instantiate(p_type)) ||
(p_type_category == TypeCategory::OTHER_TYPE && !is_abstract);
(p_type_category == TypeCategory::OTHER_TYPE && !(!allow_abstract_scripts && is_abstract));
bool instantiable = can_instantiate && !(ClassDB::class_exists(p_type) && ClassDB::is_virtual(p_type));

r_item->set_meta(SNAME("__instantiable"), instantiable);
Expand Down
2 changes: 2 additions & 0 deletions editor/gui/create_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class CreateDialog : public ConfirmationDialog {

String base_type;
bool is_base_type_node = false;
bool allow_abstract_scripts = false;
String icon_fallback;
String preferred_search_result_type;

Expand Down Expand Up @@ -125,6 +126,7 @@ class CreateDialog : public ConfirmationDialog {
void set_preferred_search_result_type(const String &p_preferred_type) { preferred_search_result_type = p_preferred_type; }

void popup_create(bool p_dont_clear, bool p_replace_mode = false, const String &p_current_type = "", const String &p_current_name = "");
void for_inherit();

CreateDialog();
};
1 change: 1 addition & 0 deletions editor/script/script_create_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,7 @@ ScriptCreateDialog::ScriptCreateDialog() {

select_class = memnew(CreateDialog);
select_class->connect("create", callable_mp(this, &ScriptCreateDialog::_create));
select_class->for_inherit();
add_child(select_class);

file_browse = memnew(EditorFileDialog);
Expand Down
Loading