gtk+ r22582 - in trunk: . gdk

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Mar 24 05:57:53 2009
New Revision: 22582
URL: http://svn.gnome.org/viewvc/gtk+?rev=22582&view=rev

Log:
Fix get_nearest_monitor


Modified:
   trunk/ChangeLog
   trunk/gdk/gdkscreen.c

Modified: trunk/gdk/gdkscreen.c
==============================================================================
--- trunk/gdk/gdkscreen.c	(original)
+++ trunk/gdk/gdkscreen.c	Tue Mar 24 05:57:53 2009
@@ -213,7 +213,7 @@
   gint num_monitors, i;
   gint nearest_dist = G_MAXINT;
   gint nearest_monitor = 0;
-  
+
   g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
 
   num_monitors = gdk_screen_get_n_monitors (screen);
@@ -221,7 +221,7 @@
   for (i = 0; i < num_monitors; i++)
     {
       GdkRectangle monitor;
-      gint dist_x, dist_y;
+      gint dist_x, dist_y, dist;
       
       gdk_screen_get_monitor_geometry (screen, i, &monitor);
 
@@ -239,9 +239,10 @@
       else
 	dist_y = 0;
 
-      if (MIN (dist_x, dist_y) < nearest_dist)
+      dist = dist_x + dist_y;
+      if (dist < nearest_dist)
 	{
-	  nearest_dist = MIN (dist_x, dist_y);
+	  nearest_dist = dist;
 	  nearest_monitor = i;
 	}
     }