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 | |
| 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
| -rw-r--r-- | eel/eel-background.c | 25 | ||||
| -rw-r--r-- | eel/eel-gdk-extensions.c | 7 |
2 files changed, 29 insertions, 3 deletions
diff --git a/eel/eel-background.c b/eel/eel-background.c index f652e98e..1966a85a 100644 --- a/eel/eel-background.c +++ b/eel/eel-background.c @@ -157,12 +157,24 @@ eel_background_unrealize (EelBackground *self) self->details->bg_entire_width = 0; self->details->bg_entire_height = 0; +#if GTK_CHECK_VERSION (3, 0, 0) + self->details->default_color.red = 1.0; + self->details->default_color.green = 1.0; + self->details->default_color.blue = 1.0; + self->details->default_color.alpha = 1.0; +#else self->details->default_color.red = 0xffff; self->details->default_color.green = 0xffff; self->details->default_color.blue = 0xffff; +#endif } +#if GTK_CHECK_VERSION (3, 0, 0) +#define CLAMP_COLOR(v) (CLAMP ((v), 0, 1)) +#else #define CLAMP_COLOR(v) (t = (v), CLAMP (t, 0, G_MAXUSHORT)) +#endif + #define SATURATE(v) ((1.0 - saturation) * intensity + saturation * (v)) static void @@ -174,7 +186,9 @@ make_color_inactive (EelBackground *self, #endif { double intensity, saturation; +#if !GTK_CHECK_VERSION (3, 0, 0) gushort t; +#endif if (!self->details->is_active) { saturation = 0.7; @@ -183,7 +197,11 @@ make_color_inactive (EelBackground *self, color->green = SATURATE (color->green); color->blue = SATURATE (color->blue); +#if GTK_CHECK_VERSION (3, 0, 0) + if (intensity > 0.5) +#else if (intensity > G_MAXUSHORT / 2) +#endif { color->red *= 0.9; color->green *= 0.9; @@ -928,9 +946,16 @@ eel_background_init (EelBackground *self) EelBackgroundDetails); self->details->bg = mate_bg_new (); +#if GTK_CHECK_VERSION (3, 0, 0) + self->details->default_color.red = 1.0; + self->details->default_color.green = 1.0; + self->details->default_color.blue = 1.0; + self->details->default_color.alpha = 1.0; +#else self->details->default_color.red = 0xffff; self->details->default_color.green = 0xffff; self->details->default_color.blue = 0xffff; +#endif self->details->is_active = TRUE; g_signal_connect (self->details->bg, "changed", 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: |