Merge lp:~larsu/notify-osd/lp1303796 into lp:notify-osd

[Lars Karlitski]

Listen to xsettings dpi changes

We only listened to font scale factor changes on gsettings, but retrieved the actual value from xsettings (through gtk-xft-dpi). This is racy: unity-settings-daemon also listens to gsettings and might not have set the xsettings value when our handler is run.

Fix this by listening to xsettings changes as well.

This means that we're now listening for both xsettings and gsettings changes for what is essentially the same thing and recalculate size on each of them. This creates some unnecessary work, but those settings are not changed very often. We can't only listen on xsettings, because there are other gsettings keys that might trigger a change in notification bubble appearance.

Listen to xsettings font size changes in addition to the gsettings ones.

We still don't update the position and size of the bubble itself when a notification bubble is shown while the font settings are changed. This is ugly, but fixing it would require quite a bit of a refactor that might not be worth it.

[Sebastien Bacher (seb128)]

looks good, thanks!

review: Approve

=== modified file 'src/defaults.c'
--- src/defaults.c	2014-12-20 19:02:42 +0000
+++ src/defaults.c	2015-11-03 18:43:29 +0000
@@ -468,6 +468,11 @@
 					  G_CALLBACK (_font_changed),
 					  self);
 
+	g_signal_connect (gtk_settings_get_default (),
+			  "notify::gtk-xft-dpi",
+			  G_CALLBACK (_font_changed),
+			  self);
+
 	g_signal_connect (self->nosd_settings,
 					  "changed",
 					  G_CALLBACK (_gravity_changed),

=== modified file 'src/stack.c'
--- src/stack.c	2013-11-07 15:37:20 +0000
+++ src/stack.c	2015-11-03 18:43:29 +0000
@@ -269,16 +269,22 @@
 	bubble_refresh (bubble);
 }
 
+static Bubble *sync_bubble = NULL;
+
 static void
 value_changed_handler (Defaults* defaults,
 		       Stack*    stack)
 {
 	if (stack->list != NULL)
 		g_list_foreach (stack->list, _trigger_bubble_redraw, NULL);
+
+	if (sync_bubble != NULL)
+	{
+		bubble_recalc_size (sync_bubble);
+		bubble_refresh (sync_bubble);
+	}
 }
 
-static Bubble *sync_bubble = NULL;
-
 #include "display.c"
 
 /*-- public API --------------------------------------------------------------*/