summaryrefslogtreecommitdiffstats
path: root/editor/plugins/script_text_editor.cpp
diff options
context:
space:
mode:
authorPoommetee Ketson <poommetee@protonmail.com>2017-07-04 05:52:45 +0700
committerPoommetee Ketson <poommetee@protonmail.com>2017-07-18 09:43:16 +0700
commit668d00ff2d0d0673ae2c02310fd1cdffec4a2940 (patch)
tree3e28902adfbbf6ddb14997a56d1fb9aeed7b823d /editor/plugins/script_text_editor.cpp
parentf36cd77feb9790847c6123eccfa18be74fc89b32 (diff)
downloadredot-engine-668d00ff2d0d0673ae2c02310fd1cdffec4a2940.tar.gz
Fix ColorPicker to use theme constants
Diffstat (limited to 'editor/plugins/script_text_editor.cpp')
-rw-r--r--editor/plugins/script_text_editor.cpp3
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);