f-spot r3818 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Fri Apr 11 16:22:16 2008
New Revision: 3818
URL: http://svn.gnome.org/viewvc/f-spot?rev=3818&view=rev

Log:
2008-04-11  Stephane Delcroix  <sdelcroix novell com>

	* src/ControlOverlay.cs: patch from Fabian Kneissl to fix the
	toolbar positionning in fullscreen. bgo #526318.


Modified:
   trunk/ChangeLog
   trunk/src/ControlOverlay.cs

Modified: trunk/src/ControlOverlay.cs
==============================================================================
--- trunk/src/ControlOverlay.cs	(original)
+++ trunk/src/ControlOverlay.cs	Fri Apr 11 16:22:16 2008
@@ -264,14 +264,17 @@
 			
 			host.GdkWindow.GetOrigin (out x, out y);
 
+			int xOrigin = x;
+			int yOrigin = y;
+
 			x += (int) (host.Allocation.Width * x_align);
 			y += (int) (host.Allocation.Height * y_align);
 			
 			x -= (int) (Allocation.Width * 0.5);
 			y -= (int) (Allocation.Height * 0.5);
 
-			x = Math.Max (0, Math.Min (x, host.Allocation.Width - Allocation.Width));
-			y = Math.Max (0, Math.Min (y, host.Allocation.Height - Allocation.Height));
+			x = Math.Max (0, Math.Min (x, xOrigin + host.Allocation.Width - Allocation.Width));
+			y = Math.Max (0, Math.Min (y, yOrigin + host.Allocation.Height - Allocation.Height));
 			
 			Move (x, y);
 		}