Merge lp:~macslow/notify-osd/fix.810325-2 into lp:~canonical-dx-team/notify-osd/precise

[Mirco Müller]

Updated version of the branch for supporting tinting the notification-bubble background with the average color pulled from the Unity schema. This is optional and checked at runtime if available. So if notify-osd is run under a system without Unity or with an older Unity not providing the average-color, notify-osd just falls back to the regular dark grey tint.

[Sebastien Bacher (seb128)]

The code seems fine for me but I can't test since Unity 5.2 doesn't seem to include the key you are using, is that pending an Unity merge to land?

[Mirco Müller (macslow)]

Yes, the unity-part of this is in unity trunk to be released with 5.4.

[Mirco Müller (macslow)]

I just want to make sure I get this into a notify-osd release so it doesn't slip feature freeze.

[Sebastien Bacher (seb128)]

well, approving since the code seems fine assuming that you test ran it with an unity having the required changes

review: Approve

=== modified file 'src/bubble.c'
--- src/bubble.c	2012-02-07 12:29:02 +0000
+++ src/bubble.c	2012-02-08 09:29:20 +0000
@@ -663,11 +663,17 @@
 	}
 
 	// clear, render top-left part of shadow/background in scratch-surface
-    	cairo_scale (cr, 1.0f, 1.0f);
+    cairo_scale (cr, 1.0f, 1.0f);
 	cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
 	cairo_paint (cr);
 	cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
+	GdkColor color;
+	gchar* color_string = NULL;
+    color_string = defaults_get_bubble_bg_color (d);
+	gdk_color_parse (color_string, &color);
+    g_free (color_string);
+	
 	if (priv->composited)
 	{
 		_draw_shadow (
@@ -689,16 +695,16 @@
 		cairo_fill (cr);
 		cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 		cairo_set_source_rgba (cr,
-				       BUBBLE_BG_COLOR_R,
-				       BUBBLE_BG_COLOR_G,
-				       BUBBLE_BG_COLOR_B,
+				       0.75 * ((double) color.red / 65535.0),
+				       0.75 * ((double) color.green / 65535.0),
+				       0.75 * ((double) color.blue / 65535.0),
 				       BUBBLE_BG_COLOR_A);
 	}
 	else
 		cairo_set_source_rgb (cr,
-				      BUBBLE_BG_COLOR_R,
-				      BUBBLE_BG_COLOR_G,
-				      BUBBLE_BG_COLOR_B);
+				       0.75 * ((double) color.red / 65535.0),
+				       0.75 * ((double) color.green / 65535.0),
+				       0.75 * ((double) color.blue / 65535.0));
 
 	draw_round_rect (
 		cr,

=== modified file 'src/defaults.c'
--- src/defaults.c	2012-02-07 12:29:02 +0000
+++ src/defaults.c	2012-02-08 09:29:20 +0000
@@ -154,6 +154,10 @@
 #define GNOME_DESKTOP_SCHEMA         "org.gnome.desktop.interface"
 #define GSETTINGS_FONT_KEY           "font-name"
 
+/* unity settings */
+#define UNITY_SCHEMA                 "com.canonical.Unity"
+#define GSETTINGS_AVG_BG_COL_KEY     "average-bg-color"
+
 static guint g_defaults_signals[LAST_SIGNAL] = { 0 };
 
 /*-- internal API ------------------------------------------------------------*/
@@ -285,6 +289,61 @@
 	g_signal_emit (defaults, g_defaults_signals[GRAVITY_CHANGED], 0);
 }
 
+static void
+_avg_bg_color_changed (GSettings* settings,
+                       gchar*     key,
+                       gpointer   data)
+{
+	Defaults* defaults     = NULL;
+	gchar*    color_string = NULL;
+
+	if (!data || !settings)
+		return;
+
+	defaults = (Defaults*) data;
+	if (!IS_DEFAULTS (defaults))
+		return;
+
+	color_string = g_settings_get_string (settings, key);
+	g_object_set (defaults, "bubble-bg-color", color_string, NULL);
+	g_free (color_string);
+}
+
+GSettings*
+_get_unity_schema ()
+{
+	// check for availability of unity-schema
+	const gchar* const* schema_list = NULL;
+        int i = 0;
+	gboolean match = FALSE;
+	schema_list = g_settings_list_schemas (); // no need to free/unref list
+        for (i = 0; schema_list[i]; i++)
+		if (g_strcmp0 (UNITY_SCHEMA, schema_list[i]) == 0)
+		{
+			match = TRUE;
+			break;
+		}
+	if (!match)
+		return NULL;
+
+	// be really paranoid and check for "avg. bg-color" key
+	GSettings* settings = g_settings_new (UNITY_SCHEMA);
+	gchar** keys = NULL;
+	keys = g_settings_list_keys (settings);
+	i = 0;
+	match = FALSE;
+	while (keys[i] && !match)
+	{
+		match = g_strcmp0 (keys[i], GSETTINGS_AVG_BG_COL_KEY) == 0 ? TRUE : FALSE;
+		i++;
+	}
+	g_strfreev (keys);
+	if (!match)
+		return NULL;
+
+	return settings;
+}
+
 void
 defaults_refresh_screen_dimension_properties (Defaults *self)
 {
@@ -403,6 +462,10 @@
 			      NULL);
 	}
 
+	_avg_bg_color_changed (self->unity_settings,
+			       GSETTINGS_AVG_BG_COL_KEY,
+			       self);
+
 	/* FIXME: calling this here causes a segfault */
 	/* chain up to the parent class */
 	/*G_OBJECT_CLASS (defaults_parent_class)->constructed (gobject);*/
@@ -417,6 +480,7 @@
 
 	g_object_unref (defaults->nosd_settings);
 	g_object_unref (defaults->gnome_settings);
+	g_object_unref (defaults->unity_settings);
 
 	if (defaults->bubble_shadow_color)
 	{
@@ -482,7 +546,8 @@
 {
 	/* "connect" to the required GSettings schemas */
 	self->nosd_settings  = g_settings_new (NOTIFY_OSD_SCHEMA);
-	self->gnome_settings = g_settings_new (GNOME_DESKTOP_SCHEMA);; 
+	self->gnome_settings = g_settings_new (GNOME_DESKTOP_SCHEMA);
+	self->unity_settings = _get_unity_schema ();
 
 	g_signal_connect (self->gnome_settings,
 					  "changed",
@@ -493,6 +558,13 @@
 					  "changed",
 					  G_CALLBACK (_gravity_changed),
 					  self);
+	if (self->unity_settings)
+	{
+		g_signal_connect (self->unity_settings,
+				  "changed",
+				  G_CALLBACK (_avg_bg_color_changed),
+				  self);
+	}
 
 	// use fixed slot-allocation for async. and sync. bubbles
 	self->slot_allocation = SLOT_ALLOCATION_FIXED;

=== modified file 'src/defaults.h'
--- src/defaults.h	2012-02-07 12:29:02 +0000
+++ src/defaults.h	2012-02-08 09:29:20 +0000
@@ -76,6 +76,7 @@
 	/* private */
 	GSettings*     nosd_settings;
 	GSettings*     gnome_settings;
+	GSettings*     unity_settings;
 	gint           desktop_width;
 	gint           desktop_height;
 	gint           desktop_top;