summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPedro J. Estébanez <pedrojrulez@gmail.com>2016-10-10 12:20:52 +0200
committerPedro J. Estébanez <pedrojrulez@gmail.com>2016-10-10 12:21:31 +0200
commit7b293aa4d412c938b56d8996dab04232d3c40e2e (patch)
treeaf308f88d48a1a08f5f969bf19fad005ed163b2a /tools
parentfea1fb0925142c3279fd3afaf27e80e78cd2e1e8 (diff)
Allow step for integer properties
Small readability improvement
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/property_editor.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 7163836f73..f18d5c928a 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -328,26 +328,26 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
if (c>=2) {
if (!hint_text.get_slice(",",1).empty())
- max=hint_text.get_slice(",",1).to_double();
+ max=hint_text.get_slice(",",1).to_double();
}
- if (type==Variant::REAL && c>=3) {
+ if (c>=3) {
if (!hint_text.get_slice(",",2).empty())
- step= hint_text.get_slice(",",2).to_double();
+ step= hint_text.get_slice(",",2).to_double();
}
if (c>=4 && hint_text.get_slice(",",3)=="slider") {
slider->set_min(min);
slider->set_max(max);
- slider->set_step((type==Variant::REAL) ? step : 1);
+ slider->set_step(step);
slider->set_val(v);
slider->show();
set_size(Size2(110,30)*EDSCALE);
} else {
spinbox->set_min(min);
spinbox->set_max(max);
- spinbox->set_step((type==Variant::REAL) ? step : 1);
+ spinbox->set_step(step);
spinbox->set_val(v);
spinbox->show();
set_size(Size2(70,35)*EDSCALE);
@@ -3258,7 +3258,7 @@ void PropertyEditor::update_tree() {
max=p.hint_string.get_slice(",",1).to_double();
}
- if (p.type==Variant::REAL && c>=3) {
+ if (p.type!=PROPERTY_HINT_SPRITE_FRAME && c>=3) {
step= p.hint_string.get_slice(",",2).to_double();
}