mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 04:22:05 +00:00
Revert "[color] allow alpha to omitted when converting from strings"
This reverts commit eb8daac4b0
.
The original commit was incorrect and pushed accidentally.
This commit is contained in:
parent
bdf7499207
commit
142f886518
@ -432,28 +432,6 @@ clutter_color_from_string (ClutterColor *color,
|
|||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
else if (strlen (str) == 7)
|
|
||||||
{
|
|
||||||
/* #rrggbb */
|
|
||||||
color->red = (result >> 24) & 0xff;
|
|
||||||
color->green = (result >> 16) & 0xff;
|
|
||||||
color->blue = (result >> 8) & 0xff;
|
|
||||||
|
|
||||||
color->alpha = 0xff;
|
|
||||||
}
|
|
||||||
else if (strlen (str) == 4)
|
|
||||||
{
|
|
||||||
/* #rgb */
|
|
||||||
color->red = ((result >> 12) & 0xf);
|
|
||||||
color->green = ((result >> 8) & 0xf);
|
|
||||||
color->blue = ((result >> 4) & 0xf);
|
|
||||||
|
|
||||||
color->red = (color->red << 4) | color->red;
|
|
||||||
color->green = (color->green << 4) | color->green;
|
|
||||||
color->blue = (color->blue << 4) | color->blue;
|
|
||||||
|
|
||||||
color->alpha = 0xff;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user