Merge lp:~wwwjfy/notify-osd/dual-monitor-fix into lp:notify-osd/lucid

[Tony Wang]

fix the bug about the display position for dual-monitor screen.

fix the bug about the display position for dual-monitor screen.

[David Barth (dbarth)]

Thanks for the fix.

review: Approve

[Vincent Untz (vuntz)]

Any idea if the patch will go in soon?

[Mirco Müller (macslow)]

I will work on reviewing/testing a number of patches for notify-osd this weekend. Depending on the state of contributor-agreements, which I'm not on top off atm, numerous stuff will land in notify-osd. This one is among the list of patches I'll work on, vuntz.

=== modified file 'src/defaults.c'
--- src/defaults.c	2009-10-25 06:00:23 +0000
+++ src/defaults.c	2010-09-20 11:49:39 +0000
@@ -2440,6 +2440,7 @@
 	gint         panel_monitor    = 0;
 	gint         aw_monitor;
 	gboolean     has_panel_window = FALSE;
+	gboolean     follow_focus     = defaults_multihead_does_focus_follow (self);
 
 	g_return_if_fail (self != NULL && IS_DEFAULTS (self));
 
@@ -2467,7 +2468,7 @@
 		has_panel_window  = TRUE;
 	}
 
-	if (defaults_multihead_does_focus_follow (self))
+	if (follow_focus)
 	{
 		g_debug ("multi_head_focus_follow mode");
 		monitor = gdk_screen_get_monitor_at_point (screen, mx, my);
@@ -2505,7 +2506,7 @@
 	{
 		/* position the corner on the selected monitor */
 		rect.y += panel_rect.y + panel_rect.height;
-	} else if (! has_panel_window)
+	} else if (! (has_panel_window || follow_focus))
 	{
 		g_debug ("no panel detetected; using workarea fallback");