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

Fix EditorPropertyInteger and EditorPropertyEnum support for 64-bit int

Browse Source 
Fixes #26116 and fixes #22004, thanks @kiidmale.
This commit is contained in:
Rémi Verschelde
2019-02-21 13:07:26 +01:00
parent b39e1df704
commit 5585420e79
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor/editor_properties.cpp
View File

@ -483,16 +483,16 @@ EditorPropertyCheck::EditorPropertyCheck() {
void EditorPropertyEnum::_option_selected(int p_which) { void EditorPropertyEnum::_option_selected(int p_which) {
int val = options->get_item_metadata(p_which); int64_t val = options->get_item_metadata(p_which);
emit_changed(get_edited_property(), val); emit_changed(get_edited_property(), val);
} }
void EditorPropertyEnum::update_property() { void EditorPropertyEnum::update_property() {
int which = get_edited_object()->get(get_edited_property()); int64_t which = get_edited_object()->get(get_edited_property());
for (int i = 0; i < options->get_item_count(); i++) { for (int i = 0; i < options->get_item_count(); i++) {
if (which == (int)options->get_item_metadata(i)) { if (which == (int64_t)options->get_item_metadata(i)) {
options->select(i); options->select(i);
return; return;
} }
@ -501,11 +501,11 @@ void EditorPropertyEnum::update_property() {
void EditorPropertyEnum::setup(const Vector<String> &p_options) { void EditorPropertyEnum::setup(const Vector<String> &p_options) {
int current_val = 0; int64_t current_val = 0;
for (int i = 0; i < p_options.size(); i++) { for (int i = 0; i < p_options.size(); i++) {
Vector<String> text_split = p_options[i].split(":"); Vector<String> text_split = p_options[i].split(":");
if (text_split.size() != 1) if (text_split.size() != 1)
current_val = text_split[1].to_int(); current_val = text_split[1].to_int64();
options->add_item(text_split[0]); options->add_item(text_split[0]);
options->set_item_metadata(i, current_val); options->set_item_metadata(i, current_val);
current_val += 1; current_val += 1;
@ -801,11 +801,11 @@ EditorPropertyLayers::EditorPropertyLayers() {
void EditorPropertyInteger::_value_changed(double val) { void EditorPropertyInteger::_value_changed(double val) {
if (setting) if (setting)
return; return;
emit_changed(get_edited_property(), int(val)); emit_changed(get_edited_property(), (int64_t)val);
} }
void EditorPropertyInteger::update_property() { void EditorPropertyInteger::update_property() {
int val = get_edited_object()->get(get_edited_property()); int64_t val = get_edited_object()->get(get_edited_property());
setting = true; setting = true;
spin->set_value(val); spin->set_value(val);
setting = false; setting = false;