diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-18 07:52:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 07:52:32 +0200 |
| commit | 5a42bbaace7d8a72e2842f760c6ac905ac238d2c (patch) | |
| tree | bbf86c8419d5676e23149c266da8a6e7c8552f4d /editor/plugins/script_text_editor.cpp | |
| parent | e089989777589a830884b7142e03bc306fa43bac (diff) | |
| parent | 668d00ff2d0d0673ae2c02310fd1cdffec4a2940 (diff) | |
Merge pull request #9482 from Noshyaar/pr-ramp
Fix shrunk ColorPickers
Diffstat (limited to 'editor/plugins/script_text_editor.cpp')
| -rw-r--r-- | editor/plugins/script_text_editor.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 83741c7fb8..e260b1ea22 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1276,8 +1276,6 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) { color_picker->set_pick_color(Color(color[0], color[1], color[2], alpha)); } color_panel->set_position(get_global_transform().xform(get_local_mouse_pos())); - Size2 ms = Size2(300, color_picker->get_combined_minimum_size().height + 10); - color_panel->set_size(ms); } else { have_color = false; } @@ -1360,7 +1358,6 @@ ScriptTextEditor::ScriptTextEditor() { add_child(color_panel); color_picker = memnew(ColorPicker); color_panel->add_child(color_picker); - color_panel->set_child_rect(color_picker); //NOT color_picker->connect("color_changed", this, "_color_changed"); edit_hb = memnew(HBoxContainer); |