[Galago-commits] r3019 - in trunk/notification-daemon: . src/themes/standard

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2008-11-20 01:24:36 -0800 (Thu, 20 Nov 2008)
New Revision: 3019

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/themes/standard/theme.c
Log:
Fix the new multihead notification code so that we don't just stick notifications off-screen when the notification window would be slightly off-screen. The code was just broken and this new code should be working a lot better.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2008-10-23 21:39:04 UTC (rev 3018)
+++ trunk/notification-daemon/ChangeLog	2008-11-20 09:24:36 UTC (rev 3019)
@@ -1,3 +1,11 @@
+Thu Nov 20 01:23:56 PST 2008  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/themes/standard/theme.c:
+	  - Fix the new multihead notification code so that we don't just stick
+	    notifications off-screen when the notification window would be slightly
+	    off-screen. The code was just broken and this new code should be working a
+	    lot better.
+
 Thu Sep 25 18:53:21 PDT 2008  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/capplet/notification-properties.glade:

Modified: trunk/notification-daemon/src/themes/standard/theme.c
===================================================================
--- trunk/notification-daemon/src/themes/standard/theme.c	2008-10-23 21:39:04 UTC (rev 3018)
+++ trunk/notification-daemon/src/themes/standard/theme.c	2008-11-20 09:24:36 UTC (rev 3019)
@@ -262,11 +262,8 @@
 				if (norm_point_x - arrow_side2_width + width >=
 					monitor_geometry.width)
 				{
-					arrow_offset =
-						width - arrow_side1_width - arrow_side2_width -
-						monitor_geometry.width -
-						MAX(norm_point_x + arrow_side1_width,
-							monitor_geometry.width - DEFAULT_ARROW_OFFSET);
+					arrow_offset = width - monitor_geometry.width +
+						           norm_point_x;
 				}
 				else
 				{
@@ -302,7 +299,6 @@
 			windata->drawn_arrow_middle_x = arrow_offset + arrow_side1_width;
 			windata->drawn_arrow_end_x = arrow_offset + arrow_side1_width +
 										 arrow_side2_width;
-
 			if (arrow_type == GTK_ARROW_UP)
 			{
 				windata->drawn_arrow_begin_y = DEFAULT_ARROW_HEIGHT;