diff options
| author | Rémi Verschelde | 2017-07-18 07:52:32 +0200 |
|---|---|---|
| committer | GitHub | 2017-07-18 07:52:32 +0200 |
| commit | 5a42bbaace7d8a72e2842f760c6ac905ac238d2c (patch) | |
| tree | bbf86c8419d5676e23149c266da8a6e7c8552f4d /editor/property_editor.cpp | |
| parent | e089989777589a830884b7142e03bc306fa43bac (diff) | |
| parent | 668d00ff2d0d0673ae2c02310fd1cdffec4a2940 (diff) | |
| download | godot-5a42bbaace7d8a72e2842f760c6ac905ac238d2c.tar.gz godot-5a42bbaace7d8a72e2842f760c6ac905ac238d2c.tar.zst godot-5a42bbaace7d8a72e2842f760c6ac905ac238d2c.zip | |
Merge pull request #9482 from Noshyaar/pr-ramp
Fix shrunk ColorPickers
Diffstat (limited to 'editor/property_editor.cpp')
| -rw-r--r-- | editor/property_editor.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 6fac9eb65..31be4e181 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -815,16 +815,12 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: color_picker = memnew(ColorPicker); add_child(color_picker); color_picker->hide(); - color_picker->set_area_as_parent_rect(); - for (int i = 0; i < 4; i++) - color_picker->set_margin((Margin)i, 5); color_picker->connect("color_changed", this, "_color_changed"); } color_picker->show(); color_picker->set_edit_alpha(hint != PROPERTY_HINT_COLOR_NO_ALPHA); color_picker->set_pick_color(v); - set_size(Size2(307 * EDSCALE, 460 * EDSCALE)); color_picker->set_focus_on_line_edit(); /* int ofs=80; |