diff options
| author | Alexei Sorokin <[email protected]> | 2017-02-02 18:52:49 +0300 |
|---|---|---|
| committer | Alexei Sorokin <[email protected]> | 2017-02-02 18:52:49 +0300 |
| commit | 9b62a56cbed4ffc7a1a014cf15f1e0ed767cd928 (patch) | |
| tree | 38cc82d2a9985a136263e43d258aeb88808c95b9 /eel/eel-background.c | |
| parent | 021b757ddc5878475fd0fa54e4126d60766e5fc9 (diff) | |
| download | caja-9b62a56cbed4ffc7a1a014cf15f1e0ed767cd928.tar.bz2 caja-9b62a56cbed4ffc7a1a014cf15f1e0ed767cd928.tar.xz | |
eel: GdkRGBA related fixes
Diffstat (limited to 'eel/eel-background.c')
| -rw-r--r-- | eel/eel-background.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/eel/eel-background.c b/eel/eel-background.c index 2734cdce..c1ef5c6c 100644 --- a/eel/eel-background.c +++ b/eel/eel-background.c @@ -137,20 +137,20 @@ eel_background_unrealize (EelBackground *self) self->details->bg_entire_width = 0; self->details->bg_entire_height = 0; - self->details->default_color.red = 0xffff; - self->details->default_color.green = 0xffff; - self->details->default_color.blue = 0xffff; + 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; } -#define CLAMP_COLOR(v) (t = (v), CLAMP (t, 0, G_MAXUSHORT)) +#define CLAMP_COLOR(v) (CLAMP ((v), 0, 1)) #define SATURATE(v) ((1.0 - saturation) * intensity + saturation * (v)) static void make_color_inactive (EelBackground *self, - GdkRGBA *color) + GdkRGBA *color) { double intensity, saturation; - gushort t; if (!self->details->is_active) { saturation = 0.7; @@ -159,7 +159,7 @@ make_color_inactive (EelBackground *self, color->green = SATURATE (color->green); color->blue = SATURATE (color->blue); - if (intensity > G_MAXUSHORT / 2) + if (intensity > 0.5) { color->red *= 0.9; color->green *= 0.9; @@ -785,9 +785,10 @@ eel_background_init (EelBackground *self) EelBackgroundDetails); self->details->bg = mate_bg_new (); - self->details->default_color.red = 0xffff; - self->details->default_color.green = 0xffff; - self->details->default_color.blue = 0xffff; + 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; self->details->is_active = TRUE; g_signal_connect (self->details->bg, "changed", |