diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 02:48:45 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 02:48:45 -0300 |
| commit | c688b55019e485ddf66cd119173016ec6c8bd4e5 (patch) | |
| tree | 8f1d9eac70d8689545a66a378b4937530b42e8a7 /tools/editor/property_editor.h | |
| parent | a19a653e2cae50f43b8de5d4ba69170c7d2fa800 (diff) | |
| parent | 7bc9846f169a0a65970c64ca3fc2e799eaa8b990 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
# tools/editor/property_editor.cpp
# tools/editor/property_editor.h
Diffstat (limited to 'tools/editor/property_editor.h')
| -rw-r--r-- | tools/editor/property_editor.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h index f6e2dfcf50..426c19faf4 100644 --- a/tools/editor/property_editor.h +++ b/tools/editor/property_editor.h @@ -96,6 +96,7 @@ class CustomPropertyEditor : public Popup { SpinBox *spinbox; HSlider *slider; + Control *easing_draw; Object* owner; @@ -159,10 +160,14 @@ class PropertyEditor : public Control { bool read_only; bool show_categories; float refresh_countdown; + bool use_doc_hints; HashMap<String,String> pending; String selected_property; + Map<StringName,Map<StringName,String> > descr_cache; + Map<StringName,String > class_descr_cache; + CustomPropertyEditor *custom_editor; void _resource_edit_request(); @@ -219,8 +224,9 @@ public: void set_autoclear(bool p_enable); void set_show_categories(bool p_show); - - PropertyEditor(); + void set_use_doc_hints(bool p_enable) { use_doc_hints=p_enable; } + + PropertyEditor(); ~PropertyEditor(); }; |