[murrine] Better code for the previous commit



commit 16efa3d2461f91e109e49c68f4658a7d553568e4
Author: Andrea Cimitan <andrea cimitan Å?mail com>
Date:   Tue Aug 17 23:59:53 2010 +0200

    Better code for the previous commit

 src/murrine_draw.c      |    3 +--
 src/murrine_draw_rgba.c |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index d9612b3..7261db8 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -598,8 +598,7 @@ murrine_draw_scale_trough (cairo_t *cr,
 	else
 	{
 		MurrineRGB fill, border;
-		murrine_shade (&colors->bg[GTK_STATE_SELECTED], 1.0, &fill);
-		murrine_mix_color (&fill, &widget->parentbg, widget->disabled ? 0.25 : 0.0, &fill);
+		murrine_mix_color (&colors->bg[GTK_STATE_SELECTED], &widget->parentbg, widget->disabled ? 0.25 : 0.0, &fill);
 		murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &border);
 
 		murrine_scale_draw_gradient (cr, &fill, &border,
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index ac961e3..8e149b1 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -436,8 +436,7 @@ murrine_rgba_draw_scale_trough (cairo_t *cr,
 	else
 	{
 		MurrineRGB fill, border;
-		murrine_shade (&colors->bg[GTK_STATE_SELECTED], 1.0, &fill);
-		murrine_mix_color (&fill, &widget->parentbg, widget->disabled ? 0.25 : 0.0, &fill);
+		murrine_mix_color (&colors->bg[GTK_STATE_SELECTED], &widget->parentbg, widget->disabled ? 0.25 : 0.0, &fill);
 		murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &border);
 
 		murrine_scale_draw_gradient (cr, &fill, &border,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]