fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx: Factor out #rrggbb Color parsing into its own helper function

Browse Source
This commit is contained in:
Andrew Kaster
2024-07-22 14:10:16 -06:00
parent 3c5e3eef10
commit cf42bf2bca
1 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Userland/Libraries/LibGfx/Color.cpp
View File

@@ -262,12 +262,8 @@ Optional<Color> Color::from_named_css_color_string(StringView string)
return {}; return {};
} }
Optional<Color> Color::from_string(StringView string) static Optional<Color> hex_string_to_color(StringView string)
{ {
if (string.is_empty())
return {};
if (string[0] == '#') {
auto hex_nibble_to_u8 = [](char nibble) -> Optional<u8> { auto hex_nibble_to_u8 = [](char nibble) -> Optional<u8> {
if (!isxdigit(nibble)) if (!isxdigit(nibble))
return {}; return {};
@@ -315,7 +311,15 @@ Optional<Color> Color::from_string(StringView string)
return {}; return {};
return Color(r.value(), g.value(), b.value(), a.value()); return Color(r.value(), g.value(), b.value(), a.value());
} }
Optional<Color> Color::from_string(StringView string)
{
if (string.is_empty())
return {};
if (string[0] == '#')
return hex_string_to_color(string);
if (string.starts_with("rgb("sv, CaseSensitivity::CaseInsensitive) && string.ends_with(')')) if (string.starts_with("rgb("sv, CaseSensitivity::CaseInsensitive) && string.ends_with(')'))
return parse_rgb_color(string); return parse_rgb_color(string);