Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #75905 from Calinou/colorpicker-allow-named-colors 

Allow entering named colors in ColorPicker's hex field
4.1
Rémi Verschelde 2023-04-11 19:40:48 +07:00
parent f7f7250c0d 517dc3654a
commit cbf7412e38
No known key found for this signature in database
GPG Key ID: C3336907360768E1
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
Unescape Escape View File

@ -543,8 +543,9 @@ void ColorPicker::_html_submitted(const String &p_html) {
return;
}
Color previous_color = color;
color = Color::html(p_html);
const Color previous_color = color;
color = Color::from_string(p_html, previous_color);
if (!is_editing_alpha()) {
color.a = previous_color.a;
}
@ -644,13 +645,13 @@ void ColorPicker::_text_type_toggled() {
text_type->set_icon(get_theme_icon(SNAME("Script"), SNAME("EditorIcons")));
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 {
text_type->set_text("#");
text_type->set_icon(nullptr);
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();
}
@ -1793,7 +1794,10 @@ ColorPicker::ColorPicker() {
c_text = memnew(LineEdit);
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_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_changed", callable_mp(this, &ColorPicker::_text_changed));
c_text->connect("focus_exited", callable_mp(this, &ColorPicker::_html_focus_exit));