f-spot r3865 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Sun May  4 12:32:15 2008
New Revision: 3865
URL: http://svn.gnome.org/viewvc/f-spot?rev=3865&view=rev

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

	original patch from Thomas Van Machelen. Fixes bgo #400106.

	* src/FullScreenView.cs: only show the control overlay when
	your mouse is moving in its direction

	* src/ControlOverlay.cs: position the widget a bit lower to make
	it a little less intrusive. Don't draw rounded corners on the sides.

	* src/InfoOverlay.cs: align the box to the right.


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

Modified: trunk/src/ControlOverlay.cs
==============================================================================
--- trunk/src/ControlOverlay.cs	(original)
+++ trunk/src/ControlOverlay.cs	Sun May  4 12:32:15 2008
@@ -30,7 +30,7 @@
 		Delay dismiss;
 		bool auto_hide = true;
 		double x_align = 0.5;
-		double y_align = 0.8;
+		double y_align = 1.0;
 		
 		public enum VisibilityType
 		{
@@ -160,9 +160,18 @@
 			cr.Source = r;
 			r.Destroy ();
 			cr.MoveTo (round, 0);
-			cr.Arc (Allocation.Width - round, round, round, - Math.PI * 0.5, 0);
-			cr.Arc (Allocation.Width - round, Allocation.Height - round, round, 0, Math.PI * 0.5);
-			cr.Arc (round, Allocation.Height - round, round, Math.PI * 0.5, Math.PI);
+			if (x_align == 1.0)
+				cr.LineTo (Allocation.Width, 0);
+			else
+				cr.Arc (Allocation.Width - round, round, round, - Math.PI * 0.5, 0);
+			if (x_align == 1.0 || y_align == 1.0)
+				cr.LineTo (Allocation.Width, Allocation.Height);
+			else
+				cr.Arc (Allocation.Width - round, Allocation.Height - round, round, 0, Math.PI * 0.5);
+			if (y_align == 1.0)
+				cr.LineTo (0, Allocation.Height);
+			else
+				cr.Arc (round, Allocation.Height - round, round, Math.PI * 0.5, Math.PI);
 			cr.Arc (round, round, round, Math.PI, Math.PI * 1.5);
 			cr.ClosePath ();
 			cr.Fill ();			

Modified: trunk/src/FullScreenView.cs
==============================================================================
--- trunk/src/FullScreenView.cs	(original)
+++ trunk/src/FullScreenView.cs	Sun May  4 12:32:15 2008
@@ -268,8 +268,11 @@
 			int x, y;
 			Gdk.ModifierType type;
 			((Gtk.Widget)sender).GdkWindow.GetPointer (out x, out y, out type);
-			controls.Visibility = ControlOverlay.VisibilityType.Partial;
-			scroll.ShowControls ();
+
+			if (y > (Allocation.Height * 0.66)) {
+				controls.Visibility = ControlOverlay.VisibilityType.Partial;
+				scroll.ShowControls ();
+			}
 		}
 
 		public PhotoImageView View {

Modified: trunk/src/InfoOverlay.cs
==============================================================================
--- trunk/src/InfoOverlay.cs	(original)
+++ trunk/src/InfoOverlay.cs	Sun May  4 12:32:15 2008
@@ -43,7 +43,7 @@
 
 		public InfoOverlay (Widget w, BrowsablePointer item) : base (w)
 		{
-			XAlign = 0.9;
+			XAlign = 1.0;
 			YAlign = 0.1;
 			box = new InfoItem (item);
 			box.BorderWidth = 15;