isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle "color: inherit" directly in get_color_from_term(), not in libcroco

Browse Source 
The idea is to move handling of "inherit" as early in the parsing as possible.

Part of https://gitlab.gnome.org/GNOME/gnome-shell/issues/1934
This commit is contained in:
Federico Mena Quintero 2019-11-21 18:30:03 -06:00 committed by Florian Müllner
parent 52f5793c9b
commit 236bdaa53c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/st/st-theme-node.c
View File

@ -581,10 +581,14 @@ get_color_from_term (StThemeNode *node,
CRRgb rgb; CRRgb rgb;
enum CRStatus status; enum CRStatus status;
if (term_is_inherit (term))
{
return VALUE_INHERIT;
}
/* Since libcroco doesn't know about rgba colors, it can't handle /* Since libcroco doesn't know about rgba colors, it can't handle
* the transparent keyword * the transparent keyword
*/ */
if (term_is_transparent (term)) else if (term_is_transparent (term))
{ {
*color = TRANSPARENT_COLOR; *color = TRANSPARENT_COLOR;
return VALUE_FOUND; return VALUE_FOUND;
@ -606,9 +610,6 @@ get_color_from_term (StThemeNode *node,
if (status != CR_OK) if (status != CR_OK)
return VALUE_NOT_FOUND; return VALUE_NOT_FOUND;
if (rgb.inherit)
return VALUE_INHERIT;
if (rgb.is_percentage) if (rgb.is_percentage)
cr_rgb_compute_from_percentage (&rgb); cr_rgb_compute_from_percentage (&rgb);