diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-18 13:52:51 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-18 13:52:51 +0100 |
| commit | c0b9634235ee67415506b5a75a6bd7bb5ef28f21 (patch) | |
| tree | 181551d7081ed0b1b25dd036f6d76062d2289509 /tools/editor/property_editor.cpp | |
| parent | 4290a25bd54623be1fee4db2911f7ddcc9b88ba8 (diff) | |
| parent | e730d4b3d99a1e787ae6bcfc9949dbb665352d1c (diff) | |
Merge pull request #2854 from MarianoGnu/color_picker
new ColorPicker
Diffstat (limited to 'tools/editor/property_editor.cpp')
| -rw-r--r-- | tools/editor/property_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index cc7db57145..286a8f25b1 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -595,7 +595,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty color_picker->show(); color_picker->set_edit_alpha(hint!=PROPERTY_HINT_COLOR_NO_ALPHA); color_picker->set_color(v); - set_size( Size2(350, color_picker->get_combined_minimum_size().height+10)); + set_size( Size2(300, color_picker->get_combined_minimum_size().height+10)); /* int ofs=80; int m=10; |