diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-04 08:36:14 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-04 08:36:14 +0200 |
| commit | a79e3906135c2258b5bf9814e4971c4fc2f231e6 (patch) | |
| tree | 58c6097448dd5aabfaa72fe5a943c51ae051f413 /tools | |
| parent | db0fde9d39687937567c208e989cf25b15e09af4 (diff) | |
| parent | 723c0d730c0bb3df888934dd94ed1e45f24b7acd (diff) | |
Merge pull request #4543 from djrm/better_hint_all
Changed barely visible PROPERTY_HINT_ALL_FLAGS buttons for checkboxes
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/property_editor.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/property_editor.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 7c88870902..2247c7a5bd 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -321,7 +321,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty ofs.y+=22*i; for(int j=0;j<10;j++) { - Button *c=checks20[i*10+j]; + CheckBox *c=checks20[i*10+j]; Point2 o=ofs; o.x+=j*22; if (j>=5) @@ -1721,7 +1721,7 @@ CustomPropertyEditor::CustomPropertyEditor() { } for(int i=0;i<20;i++) { - checks20[i]=memnew( Button ); + checks20[i]=memnew( CheckBox ); checks20[i]->set_toggle_mode(true); checks20[i]->set_focus_mode(FOCUS_NONE); add_child(checks20[i]); diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h index 1fedb832ed..693bfb3efd 100644 --- a/tools/editor/property_editor.h +++ b/tools/editor/property_editor.h @@ -31,6 +31,7 @@ #include "scene/gui/tree.h" #include "scene/gui/button.h" +#include "scene/gui/check_box.h" #include "scene/gui/label.h" #include "tools/editor/editor_file_dialog.h" #include "scene/gui/dialogs.h" @@ -95,7 +96,7 @@ class CustomPropertyEditor : public Popup { ColorPicker *color_picker; TextEdit *text_edit; bool read_only; - Button *checks20[20]; + CheckBox *checks20[20]; SpinBox *spinbox; HSlider *slider; |