Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #4543 from djrm/better_hint_all 

Changed barely visible PROPERTY_HINT_ALL_FLAGS buttons for checkboxes
2.1
Rémi Verschelde 2016-05-04 08:36:14 +07:00
parent db0fde9d39 723c0d730c
commit a79e390613
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editor/property_editor.cpp
Unescape Escape View File

@ -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]);

3
tools/editor/property_editor.h
Unescape Escape View File

@ -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;