godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow entering named colors in ColorPicker's hex field

Browse Source 
This also makes the hex field wider to allow displaying 9-character
hex code (`#rrggbbaa`) in full, even when using a custom font.

(cherry picked from commit 517dc3654a)
This commit is contained in:
Hugo Locurcio 2023-04-10 21:06:02 +02:00 committed by Yuri Sizov
parent 25518aad27
commit 8a349e4fa9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/color_picker.cpp
View File

@ -500,8 +500,9 @@ void ColorPicker::_html_submitted(const String &p_html) {
return; return;
} }
Color previous_color = color; const Color previous_color = color;
color = Color::html(p_html); color = Color::from_string(p_html, previous_color);
if (!is_editing_alpha()) { if (!is_editing_alpha()) {
color.a = previous_color.a; color.a = previous_color.a;
} }
@ -601,13 +602,13 @@ void ColorPicker::_text_type_toggled() {
text_type->set_icon(get_theme_icon(SNAME("Script"), SNAME("EditorIcons"))); text_type->set_icon(get_theme_icon(SNAME("Script"), SNAME("EditorIcons")));
c_text->set_editable(false); c_text->set_editable(false);
c_text->set_h_size_flags(SIZE_EXPAND_FILL); c_text->set_tooltip_text(RTR("Copy this constructor in a script."));
} else { } else {
text_type->set_text("#"); text_type->set_text("#");
text_type->set_icon(nullptr); text_type->set_icon(nullptr);
c_text->set_editable(true); c_text->set_editable(true);
c_text->set_h_size_flags(SIZE_FILL); c_text->set_tooltip_text(RTR("Enter a hex code (\"#ff0000\") or named color (\"red\")."));
} }
_update_color(); _update_color();
} }
@ -1754,7 +1755,10 @@ ColorPicker::ColorPicker() {
c_text = memnew(LineEdit); c_text = memnew(LineEdit);
hex_hbc->add_child(c_text); hex_hbc->add_child(c_text);
c_text->set_h_size_flags(SIZE_EXPAND_FILL);
c_text->set_select_all_on_focus(true); c_text->set_select_all_on_focus(true);
c_text->set_tooltip_text(RTR("Enter a hex code (\"#ff0000\") or named color (\"red\")."));
c_text->set_placeholder(RTR("Hex code or named color"));
c_text->connect("text_submitted", callable_mp(this, &ColorPicker::_html_submitted)); c_text->connect("text_submitted", callable_mp(this, &ColorPicker::_html_submitted));
c_text->connect("text_changed", callable_mp(this, &ColorPicker::_text_changed)); c_text->connect("text_changed", callable_mp(this, &ColorPicker::_text_changed));
c_text->connect("focus_exited", callable_mp(this, &ColorPicker::_html_focus_exit)); c_text->connect("focus_exited", callable_mp(this, &ColorPicker::_html_focus_exit));