diff options
-rw-r--r-- | clutter/clutter-color.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c index a190690d1..f1c55f1c8 100644 --- a/clutter/clutter-color.c +++ b/clutter/clutter-color.c @@ -430,6 +430,28 @@ clutter_color_from_string (ClutterColor *color, 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; + } } } |