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

Merge pull request #33076 from Calinou/project-settings-fix-type-dropdown

Browse source 
Fix off-by-one error in the Project Settings type dropdown
This commit is contained in:
Rémi Verschelde 2019-10-26 08:58:20 +02:00 committed by GitHub
commit 8cef880c39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/project_settings_editor.cpp
View file

@ -845,9 +845,10 @@ void ProjectSettingsEditor::_item_adds(String) {
void ProjectSettingsEditor::_item_add() { void ProjectSettingsEditor::_item_add() {
// Initialize the property with the default value for the given type // Initialize the property with the default value for the given type.
// The type list starts at 1 (as we exclude Nil), so add 1 to the selected value.
Variant::CallError ce; Variant::CallError ce;
const Variant value = Variant::construct(Variant::Type(type->get_selected()), NULL, 0, ce); const Variant value = Variant::construct(Variant::Type(type->get_selected() + 1), NULL, 0, ce);
String catname = category->get_text().strip_edges(); String catname = category->get_text().strip_edges();
String propname = property->get_text().strip_edges(); String propname = property->get_text().strip_edges();
@ -1835,7 +1836,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
// Start at 1 to avoid adding "Nil" as an option // Start at 1 to avoid adding "Nil" as an option
for (int i = 1; i < Variant::VARIANT_MAX; i++) { for (int i = 1; i < Variant::VARIANT_MAX; i++) {
type->add_item(Variant::get_type_name(Variant::Type(i)), i); type->add_item(Variant::get_type_name(Variant::Type(i)));
} }
Button *add = memnew(Button); Button *add = memnew(Button);