asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35505 from dalexeev/rtl_colors

Browse source 
Unified named colors in RichTextLabel
This commit is contained in:
Rémi Verschelde 2021-01-08 09:03:55 +01:00 committed by GitHub
commit 9349a5507f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
core/math/color.cpp
View file

@ -355,6 +355,23 @@ bool Color::html_is_valid(const String &p_color) {
}
Color Color::named(const String &p_name) {
int idx = find_named_color(p_name);
if (idx == -1) {
ERR_FAIL_V_MSG(Color(), "Invalid color name: " + p_name + ".");
return Color();
}
return get_named_color(idx);
}
Color Color::named(const String &p_name, const Color &p_default) {
int idx = find_named_color(p_name);
if (idx == -1) {
return p_default;
}
return get_named_color(idx);
}
int Color::find_named_color(const String &p_name) {
String name = p_name;
// Normalize name
name = name.replace(" ", "");
@ -367,14 +384,12 @@ Color Color::named(const String &p_name) {
int idx = 0;
while (named_colors[idx].name != nullptr) {
if (name == named_colors[idx].name) {
return named_colors[idx].color;
return idx;
}
idx++;
}
ERR_FAIL_V_MSG(Color(), "Invalid color name: " + p_name + ".");
return Color();
return -1;
}
int Color::get_named_color_count() {
@ -384,13 +399,23 @@ int Color::get_named_color_count() {
}
return idx;
}
String Color::get_named_color_name(int p_idx) {
return named_colors[p_idx].name;
}
Color Color::get_named_color(int p_idx) {
return named_colors[p_idx].color;
}
Color Color::from_string(const String &p_string, const Color &p_default) {
if (html_is_valid(p_string)) {
return html(p_string);
} else {
return named(p_string, p_default);
}
}
String _to_hex(float p_val) {
int v = Math::round(p_val * 255);
v = CLAMP(v, 0, 255);

3
core/math/color.h
View file

@ -182,9 +182,12 @@ struct Color {
static Color html(const String &p_rgba);
static bool html_is_valid(const String &p_color);
static Color named(const String &p_name);
static Color named(const String &p_name, const Color &p_default);
static int find_named_color(const String &p_name);
static int get_named_color_count();
static String get_named_color_name(int p_idx);
static Color get_named_color(int p_idx);
static Color from_string(const String &p_string, const Color &p_default);
String to_html(bool p_alpha = true) const;
Color from_hsv(float p_h, float p_s, float p_v, float p_a) const;
static Color from_rgbe9995(uint32_t p_rgbe);

2
core/math/color_names.inc
View file

@ -156,5 +156,5 @@ static NamedColor named_colors[] = {
{ "whitesmoke", Color(0.96, 0.96, 0.96) },
{ "yellow", Color(1.00, 1.00, 0.00) },
{ "yellowgreen", Color(0.60, 0.80, 0.20) },
{ nullptr, Color(0.60, 0.80, 0.20) },
{ nullptr, Color() },
};

41
editor/editor_help.cpp
View file

@ -1549,46 +1549,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
tag_stack.push_front(tag);
} else if (tag.begins_with("color=")) {
String col = tag.substr(6, tag.length());
Color color;
if (col.begins_with("#")) {
color = Color::html(col);
} else if (col == "aqua") {
color = Color(0, 1, 1);
} else if (col == "black") {
color = Color(0, 0, 0);
} else if (col == "blue") {
color = Color(0, 0, 1);
} else if (col == "fuchsia") {
color = Color(1, 0, 1);
} else if (col == "gray" || col == "grey") {
color = Color(0.5, 0.5, 0.5);
} else if (col == "green") {
color = Color(0, 0.5, 0);
} else if (col == "lime") {
color = Color(0, 1, 0);
} else if (col == "maroon") {
color = Color(0.5, 0, 0);
} else if (col == "navy") {
color = Color(0, 0, 0.5);
} else if (col == "olive") {
color = Color(0.5, 0.5, 0);
} else if (col == "purple") {
color = Color(0.5, 0, 0.5);
} else if (col == "red") {
color = Color(1, 0, 0);
} else if (col == "silver") {
color = Color(0.75, 0.75, 0.75);
} else if (col == "teal") {
color = Color(0, 0.5, 0.5);
} else if (col == "white") {
color = Color(1, 1, 1);
} else if (col == "yellow") {
color = Color(1, 1, 0);
} else {
color = Color(0, 0, 0); //base_color;
}
Color color = Color::from_string(col, Color());
p_rt->push_color(color);
pos = brk_end + 1;
tag_stack.push_front("color");

44
scene/gui/rich_text_label.cpp
View file

@ -2001,46 +2001,6 @@ void RichTextLabel::_fetch_item_fx_stack(Item *p_item, Vector<ItemFX *> &r_stack
}
}
Color RichTextLabel::_get_color_from_string(const String &p_color_str, const Color &p_default_color) {
if (p_color_str.begins_with("#")) {
return Color::html(p_color_str);
} else if (p_color_str == "aqua") {
return Color(0, 1, 1);
} else if (p_color_str == "black") {
return Color(0, 0, 0);
} else if (p_color_str == "blue") {
return Color(0, 0, 1);
} else if (p_color_str == "fuchsia") {
return Color(1, 0, 1);
} else if (p_color_str == "gray" || p_color_str == "grey") {
return Color(0.5, 0.5, 0.5);
} else if (p_color_str == "green") {
return Color(0, 0.5, 0);
} else if (p_color_str == "lime") {
return Color(0, 1, 0);
} else if (p_color_str == "maroon") {
return Color(0.5, 0, 0);
} else if (p_color_str == "navy") {
return Color(0, 0, 0.5);
} else if (p_color_str == "olive") {
return Color(0.5, 0.5, 0);
} else if (p_color_str == "purple") {
return Color(0.5, 0, 0.5);
} else if (p_color_str == "red") {
return Color(1, 0, 0);
} else if (p_color_str == "silver") {
return Color(0.75, 0.75, 0.75);
} else if (p_color_str == "teal") {
return Color(0, 0.5, 0.5);
} else if (p_color_str == "white") {
return Color(1, 1, 1);
} else if (p_color_str == "yellow") {
return Color(1, 1, 0);
} else {
return p_default_color;
}
}
bool RichTextLabel::_find_meta(Item *p_item, Variant *r_meta, ItemMeta **r_item) {
Item *item = p_item;
@ -3173,7 +3133,7 @@ Error RichTextLabel::append_bbcode(const String &p_bbcode) {
Color color = Color(1.0, 1.0, 1.0);
OptionMap::Element *color_option = bbcode_options.find("color");
if (color_option) {
color = _get_color_from_string(color_option->value(), color);
color = Color::from_string(color_option->value(), color);
}
int width = 0;
@ -3205,7 +3165,7 @@ Error RichTextLabel::append_bbcode(const String &p_bbcode) {
tag_stack.push_front(bbcode_name);
} else if (tag.begins_with("color=")) {
String color_str = tag.substr(6, tag.length());
Color color = _get_color_from_string(color_str, base_color);
Color color = Color::from_string(color_str, base_color);
push_color(color);
pos = brk_end + 1;
tag_stack.push_front("color");

2
scene/gui/rich_text_label.h
View file

@ -421,8 +421,6 @@ private:
bool _find_layout_subitem(Item *from, Item *to);
void _fetch_item_fx_stack(Item *p_item, Vector<ItemFX *> &r_stack);
static Color _get_color_from_string(const String &p_color_str, const Color &p_default_color);
void _update_scroll();
void _update_fx(ItemFrame *p_frame, float p_delta_time);
void _scroll_changed(double);