diff options
| author | Alexei Sorokin <[email protected]> | 2017-02-02 18:52:49 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2017-02-17 15:33:37 +0300 |
| commit | 00cbc5c90d72ce819d68a44f9890d5aa94b7d20a (patch) | |
| tree | a3f70346197325bfb41f15076267954b151ccc4c /eel/eel-gdk-extensions.c | |
| parent | 894252758b9da52948c4dddee97ab2dff31ea3da (diff) | |
| download | caja-00cbc5c90d72ce819d68a44f9890d5aa94b7d20a.tar.bz2 caja-00cbc5c90d72ce819d68a44f9890d5aa94b7d20a.tar.xz | |
[GTK+3] eel: GdkRGBA related fixes
port of 9b62a56cbed4ffc7a1a014cf15f1e0ed767cd928 to mixed GTK+2/3 code
Diffstat (limited to 'eel/eel-gdk-extensions.c')
| -rw-r--r-- | eel/eel-gdk-extensions.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eel/eel-gdk-extensions.c b/eel/eel-gdk-extensions.c index 448e933a..7ac829eb 100644 --- a/eel/eel-gdk-extensions.c +++ b/eel/eel-gdk-extensions.c @@ -343,6 +343,7 @@ eel_gdk_rgba_parse_with_white_default (GdkRGBA *color, color->red = 1.0; color->green = 1.0; color->blue = 1.0; + color->alpha = 1.0; } } #else @@ -494,9 +495,9 @@ eel_gdk_rgba_is_dark (const GdkRGBA *color) { int intensity; - intensity = ((((int) (color->red) >> 8) * 77) - + (((int) (color->green) >> 8) * 150) - + (((int) (color->blue) >> 8) * 28)) >> 8; + intensity = (((guint) (color->red * 0xff) * 77) + + ((guint) (color->green * 0xff) * 150) + + ((guint) (color->blue * 0xff) * 28)) >> 8; #else /** * eel_gdk_color_is_dark: |