diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-24 23:02:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-24 23:02:02 +0200 |
| commit | 44c7210387765056d3628e669447ee02abc13e96 (patch) | |
| tree | a39f26d442f87eeb53e993ce640a6264c661ab15 /editor/property_editor.cpp | |
| parent | 78468906abe7cda14a723aca634da1142a44fcc9 (diff) | |
| parent | 443e58e88cb9b66db568a21345dc030dd0f21b89 (diff) | |
Merge pull request #9249 from Noshyaar/pr-colorpick
ColorPicker: fix DPI, hue & color update issues
Diffstat (limited to 'editor/property_editor.cpp')
| -rw-r--r-- | editor/property_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index da26c84e45..65ec697b73 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -824,7 +824,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: color_picker->show(); color_picker->set_edit_alpha(hint != PROPERTY_HINT_COLOR_NO_ALPHA); color_picker->set_pick_color(v); - set_size(Size2(300 * EDSCALE, color_picker->get_combined_minimum_size().height + 10 * EDSCALE)); + set_size(Size2(307 * EDSCALE, 460 * EDSCALE)); color_picker->set_focus_on_line_edit(); /* int ofs=80; |