Merge lp:~cimi/notify-osd/color-tweaks into lp:~canonical-dx-team/notify-osd/precise

[Andrea Cimitan]

Add some color tweak capabilities, and slightly start tweaking colors

[Mirco Müller (macslow)]

What design-guideline (bug) requires this change?

review: Needs Information

[Andrea Cimitan (cimi)]

There's no bug, but you got the mail from John Lea. The goal is to make the color more vibrant and darker trying to mimic the overlay blending used in the dash but using over as operator.

[Mirco Müller (macslow)]

I would rather review this again, when the BGHash change (from Gord) is available... which is sometime later today then.

[Andrea Cimitan (cimi)]

up! :-)

[John Lea (johnlea)]

Signed off by design

review: Approve (design)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:458
http://s-jenkins:8080/job/notify-osd-ci/2/

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:458
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-ci/./build=pbuilder,distribution=quantal,flavor=amd64/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-ci/./build=pbuilder,distribution=quantal,flavor=i386/6/console

review: Approve (continuous-integration)

[Didier Roche (didrocks)]

was never approved, approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=quantal,flavor=armhf/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=raring,flavor=armhf/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/./build=pbuilder,distribution=raring,flavor=i386/4/console

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

Apologies on Jenkins' behalf for the mess--the code should land with this new approval. (Was caught expecting inline packaging to land and had to adjust.)

=== modified file 'src/bubble.c'
--- src/bubble.c	2012-03-09 21:20:47 +0000
+++ src/bubble.c	2012-04-10 10:47:21 +0000
@@ -119,6 +119,14 @@
 	A
 };
 
+typedef struct _NotifyHSVColor NotifyHSVColor;
+
+struct _NotifyHSVColor {
+	gdouble hue;
+	gdouble saturation;
+	gdouble value;
+};
+
 #define TEMPORARY_ICON_PREFIX_WORKAROUND 1
 #ifdef TEMPORARY_ICON_PREFIX_WORKAROUND
 #warning "--== Using the icon-name-substitution! This is a temp. workaround not going to be maintained for long! ==--"
@@ -673,7 +681,16 @@
     color_string = defaults_get_bubble_bg_color (d);
 	gdk_rgba_parse (&color, color_string);
     g_free (color_string);
-	
+
+	// Apply color tweaks
+	NotifyHSVColor hsv_color;
+	gtk_rgb_to_hsv (color.red, color.green, color.blue,
+	                &hsv_color.hue, &hsv_color.saturation, &hsv_color.value);
+	hsv_color.saturation *= (2.0f - hsv_color.saturation);
+	hsv_color.value = MIN (hsv_color.value, 0.4f);
+	gtk_hsv_to_rgb (hsv_color.hue, hsv_color.saturation, hsv_color.value,
+	                &color.red, &color.green, &color.blue);
+
 	if (priv->composited)
 	{
 		_draw_shadow (
@@ -695,16 +712,16 @@
 		cairo_fill (cr);
 		cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 		cairo_set_source_rgba (cr,
-				       0.75 * color.red,
-				       0.75 * color.green,
-				       0.75 * color.blue,
+				       color.red,
+				       color.green,
+				       color.blue,
 				       BUBBLE_BG_COLOR_A);
 	}
 	else
 		cairo_set_source_rgb (cr,
-				       0.75 * color.red,
-				       0.75 * color.green,
-				       0.75 * color.blue);
+				       color.red,
+				       color.green,
+				       color.blue);
 
 	draw_round_rect (
 		cr,