asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #32624 from Calinou/project-settings-allow-all-types

Browse source 
Allow all Variant types to be added as project settings
This commit is contained in:
Rémi Verschelde 2019-10-08 16:05:29 +02:00 committed by GitHub
commit ed1cefd352
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
editor/project_settings_editor.cpp
View file

@ -845,13 +845,9 @@ void ProjectSettingsEditor::_item_adds(String) {
void ProjectSettingsEditor::_item_add() {
Variant value;
switch (type->get_selected()) {
case 0: value = false; break;
case 1: value = 0; break;
case 2: value = 0.0; break;
case 3: value = ""; break;
}
// Initialize the property with the default value for the given type
Variant::CallError ce;
const Variant value = Variant::construct(Variant::Type(type->get_selected()), NULL, 0, ce);
String catname = category->get_text().strip_edges();
String propname = property->get_text().strip_edges();
@ -1834,10 +1830,11 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
type = memnew(OptionButton);
type->set_h_size_flags(Control::SIZE_EXPAND_FILL);
add_prop_bar->add_child(type);
type->add_item("bool");
type->add_item("int");
type->add_item("float");
type->add_item("string");
// Start at 1 to avoid adding "Nil" as an option
for (int i = 1; i < Variant::VARIANT_MAX; i++) {
type->add_item(Variant::get_type_name(Variant::Type(i)), i);
}
Button *add = memnew(Button);
add_prop_bar->add_child(add);