hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9482 from Noshyaar/pr-ramp

Browse source 
Fix shrunk ColorPickers
This commit is contained in:
Rémi Verschelde 2017-07-18 07:52:32 +02:00 • committed by GitHub
commit 5a42bbaace
6 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
editor/plugins/script_text_editor.cpp
View file

@ -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);