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

[Mirco Müller]

This fixes the problem with notifications "hiding" in invisible areas of multi-monitor setups when the vertical resolutions of the attached screens differs and they are bottom-edge aligned and users go with the default setting for multimonitor-mode and gravity.

Complete with a manual-test for the QA.

[lp:~macslow/notify-osd/notify-osd.fix-716458]

458. By Mirco Müller on 2012-03-23

Updated and fixed manual-test for LP: #716458 bugfix

[Gord Allott (gordallott)]

+1

review: Approve

=== added file 'manual-tests/avoid-position-in-invisible-area.txt'
--- manual-tests/avoid-position-in-invisible-area.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/avoid-position-in-invisible-area.txt	2012-03-23 11:17:18 +0000
@@ -0,0 +1,28 @@
+1.) Have a two-monitor setup and configure the displays in such a way that the
+vertical resolution between the two monitors differs by at least 100 pixels.
+Align the displays at the bottom edge! Make the monitor with the lower vertical
+resolution the primary display.
+
+Depending on your GPU/driver combination, you can use the GNOME display-settings
+for setting this up or you have to use a tool like nvidia-settings.
+
+2.) Kill and restart notify-osd by doing...
+
+	killall -15 notify-osd
+	/usr/lib/notify-osd/notify-osd
+
+2.) Set focus-follow off and gravity to 1 with...
+
+	gsettings set com.canonical.notify-osd multihead-mode "dont-focus-follow"
+	gsettings set com.canonical.notify-osd gravity 1
+
+4.) Trigger two notifications (a synchronous one and a regular one) with these
+commands...
+
+	notify-send "Test bubble" "A regular notification used for testing." -i info
+	notify-send " " " " -i info -h string:"x-canonical-private-icon-only":1 -h string:"x-canonical-private-synchronous":1 -i info
+
+5.) You should now see both notifications fully at the visible top-right corner
+of the whole screen area.
+
+6.) For RTL-locales you have to flip 1.) - 5.) side-ways of course.

=== modified file 'src/defaults.c'
--- src/defaults.c	2012-03-09 21:21:20 +0000
+++ src/defaults.c	2012-03-23 11:17:18 +0000
@@ -2223,7 +2223,7 @@
 	g_return_if_fail (self != NULL && IS_DEFAULTS (self));
 
 	gdk_display_get_pointer (gdk_display_get_default (),
-				 &screen,
+	                         &screen,
 	                         &mx,
 	                         &my,
 	                         NULL);
@@ -2301,6 +2301,50 @@
 	*y  += EM2PIXELS (defaults_get_bubble_vert_gap (self), self)
 	       - EM2PIXELS (defaults_get_bubble_shadow_size (self), self);
 
+	/* correct potential offset in multi-monitor setups with two (or more)
+	 * monitors side by side, all having different vertical resolutions and
+	 * being aligned at the bottom edge, thus creating an "invisible" area at
+	 * the top edge of the monitor with the lowest vertical resolution,
+	 * LP: #716458 */
+	GdkRectangle cur_geo       = {0, 0, 0, 0};
+	int          num_monitors  = gdk_screen_get_n_monitors (screen);
+	int          screen_width  = gdk_screen_get_width (screen);
+	int          screen_height = gdk_screen_get_height (screen);
+
+	if (!follow_focus && num_monitors > 1)
+	{
+		int vert_offset  = 0;
+
+		if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_LTR)
+		{
+			int right_most_monitor = 0;
+
+			right_most_monitor = gdk_screen_get_monitor_at_point (screen,
+			                                                      screen_width,
+			                                                      screen_height / 2);
+			gdk_screen_get_monitor_geometry (screen,
+			                                 right_most_monitor,
+			                                 &cur_geo);
+			if (cur_geo.y != 0)
+				vert_offset = cur_geo.y;
+		}
+		else
+		{
+			int left_most_monitor = 0;
+
+			left_most_monitor = gdk_screen_get_monitor_at_point (screen,
+			                                                     0,
+			                                                     screen_height / 2);
+			gdk_screen_get_monitor_geometry (screen,
+			                                 left_most_monitor,
+			                                 &cur_geo);
+			if (cur_geo.y != 0)
+				vert_offset = cur_geo.y;
+		}
+
+		*y += vert_offset;
+	}
+
 	if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_LTR)
 	{
 		*x = rect.x + rect.width;