Merge lp:~psybers/do/intellifade into lp:do

[Robert Dyer]

[Robert Dyer (psybers)]

Adds 'Intellifade' as another hide option. This is pretty similar to Intellihide, but instead of sliding off screen it fades the dock to a certain opacity (0.4 default). That opacity is gconf configurable, allowing people to mimic the old AllowWindowOverlap behavior (opacity 1) or to truly mimic Intellihide but with only a different animation (opacity 0).

It also adds new functionality in that you can allow the dock to remain visible, but faded when not active. Thus I can still see my clock/weather/etc but it's faded enough to not get in my way too! =)

[lp:~psybers/do/intellifade]

1306. By Robert Dyer <rdyer@yamuna> on 2009-09-09

merge trunk

1307. By Robert Dyer <rdyer@yamuna> on 2009-09-10

merge trunk

1308. By Robert Dyer <rdyer@yamuna> on 2009-09-11

merge trunk

1309. By Robert Dyer <rdyer@yamuna> on 2009-09-16

make fade time more consistent for all opacities and clean the code some

1310. By Robert Dyer <rdyer@yamuna> on 2009-09-16

fix a flickering issue when minimizing/restoring windows

1311. By Robert Dyer <rdyer@yamuna> on 2009-09-16

clean code to remove unneeded fade_time var

1312. By Robert Dyer <rdyer@narmada> on 2009-10-05

merge trunk

Unmerged revisions

1312. By Robert Dyer <rdyer@narmada> on 2009-10-05

merge trunk

1311. By Robert Dyer <rdyer@yamuna> on 2009-09-16

clean code to remove unneeded fade_time var

1310. By Robert Dyer <rdyer@yamuna> on 2009-09-16

fix a flickering issue when minimizing/restoring windows

1309. By Robert Dyer <rdyer@yamuna> on 2009-09-16

make fade time more consistent for all opacities and clean the code some

1308. By Robert Dyer <rdyer@yamuna> on 2009-09-11

merge trunk

1307. By Robert Dyer <rdyer@yamuna> on 2009-09-10

merge trunk

1306. By Robert Dyer <rdyer@yamuna> on 2009-09-09

merge trunk

1305. By Robert Dyer <rdyer@yamuna> on 2009-09-03

removing old code

1304. By Robert Dyer <rdyer@yamuna> on 2009-08-31

merge trunk

1303. By Robert Dyer <rdyer@yamuna> on 2009-08-29

merge trunk

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-08-19 07:43:04 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-08-28 01:51:26 +0000
@@ -61,6 +61,7 @@
 		
 		#region Private Variables
 		DateTime enter_time = new DateTime (0);
+		DateTime fade_time = new DateTime (0);
 		DateTime interface_change_time = new DateTime (0);
 		DateTime last_draw_timeout = new DateTime (0);
 		DateTime showhide_time = new DateTime (0);
@@ -334,6 +335,7 @@
 			
 			AnimationState.AddCondition (Animations.InputModeChanged,
 			                             () => DateTime.UtcNow - interface_change_time < SummonTime || 
+			                             DateTime.UtcNow - fade_time < SummonTime ||
 			                             DateTime.UtcNow - showhide_time < SummonTime);
 		}
 		
@@ -540,6 +542,10 @@
 					if (WindowIntersectingOther)
 						showhide_time = enter_time;
 					break;
+				case AutohideType.Intellifade:
+					if (WindowIntersectingOther)
+						fade_time = enter_time;
+					break;
 				}
 				AnimatedDraw ();
 				
 
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-08-31 01:35:40 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-08-31 02:00:00 +0000
@@ -142,6 +142,19 @@
 			}
 		}
 		
+		double DockOpacity {
+			get {
+				if (PainterOverlayVisible)
+					return 1;
+				double FadeTime = SummonTime.TotalMilliseconds;
+				double FadeStartTime = (RenderTime - fade_time).TotalMilliseconds;
+				double opacity = Math.Min (1, FadeStartTime / FadeTime);
+				if (CursorIsOverDockArea || !WindowIntersectingOther)
+					return (FadeTime < FadeStartTime) ? 1 : Math.Min (1, DockPreferences.IntellifadeOpacity + opacity);
+				return Math.Max (DockPreferences.IntellifadeOpacity, 1 - opacity);
+			}
+		}
+		
 		//// <value>
 		/// Get autohide state
 		/// </value>
@@ -208,7 +221,7 @@
 			get {
 				double offset = 0;
 				// we never hide in these conditions
-				if (DockPreferences.AutohideType == AutohideType.None || DnDTracker.DragResizing || PainterOpacity == 1) {
+				if (DockPreferences.AutohideType == AutohideType.None || DockPreferences.AutohideType == AutohideType.Intellifade || DnDTracker.DragResizing || PainterOpacity == 1) {
 					if ((RenderTime - FirstRenderTime) > SummonTime)
 						return 0;
 					offset = 1 - Math.Min (1, (DateTime.UtcNow - FirstRenderTime).TotalMilliseconds / SummonTime.TotalMilliseconds);
@@ -290,14 +303,17 @@
 				showhide_time = UpdateTimeStamp (showhide_time, SummonTime);
 				AnimatedDraw ();
 			}
+			if (DockPreferences.AutohideType == AutohideType.Intellifade) {
+				fade_time = UpdateTimeStamp (fade_time, SummonTime);
+				AnimatedDraw ();
+			}
 		}
 		
 		void DrawDock (Context cr)
 		{
 			Gdk.Rectangle dockArea = GetDockArea ();
 			window.SetBackgroundBlur (dockArea);
-			
-			DockBackgroundRenderer.RenderDockBackground (cr, dockArea);
+			DockBackgroundRenderer.RenderDockBackground (cr, dockArea, DockOpacity);
 
 			IDockPainter dpaint = (Painter == null) ? LastPainter : Painter;
 			
@@ -311,7 +327,7 @@
 				}
 
 				cr.SetSource (overlay_surface);
-				cr.PaintWithAlpha (PainterOpacity);
+				cr.PaintWithAlpha (PainterOpacity * DockOpacity);
 			}
 			
 			bool isNotSummonTransition = PainterOpacity == 0 || !IsHidden || !DockPreferences.AutoHide;
@@ -326,7 +342,7 @@
 				int offset =  (int) (IconSize * (1 - DockIconOpacity));
 				Gdk.Point iconBufferLocation = new Gdk.Point (0, 0).RelativeMovePoint (offset, RelativeMove.Outward);
 				cr.SetSource (dock_icon_buffer, iconBufferLocation.X, iconBufferLocation.Y);
-				cr.PaintWithAlpha (DockIconOpacity);
+				cr.PaintWithAlpha (DockIconOpacity * DockOpacity);
 			}
 		}
 		
 
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/DockBackgroundRenderer.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/DockBackgroundRenderer.cs	2009-05-01 16:09:04 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/DockBackgroundRenderer.cs	2009-08-26 19:30:28 +0000
@@ -34,32 +34,34 @@
 	{
 		static Surface sr;
 		static int height;
+		static double oldAlpha;
 		
 		const int width = 1500;
 		
-		public static void RenderDockBackground (Context context, Gdk.Rectangle dockArea)
+		public static void RenderDockBackground (Context context, Gdk.Rectangle dockArea, double alpha)
 		{
-			if (sr == null || dockArea.Height != height) {
+			if (sr == null || dockArea.Height != height || alpha != oldAlpha) {
 				
 				if (sr != null)
 					sr.Destroy ();
 				
 				height = dockArea.Height;
+				oldAlpha = alpha;
 				sr = context.Target.CreateSimilar (context.Target.Content, width, dockArea.Height);
 				
 				using (Context cr = new Context (sr)) {
 					cr.SetRoundedRectanglePath (.5, .5, width - 1, height + 40, 5); // fall off the bottom
-					cr.Color = new Cairo.Color (0.1, 0.1, 0.1, .75);
+					cr.Color = new Cairo.Color (0.1, 0.1, 0.1, .75 * alpha);
 					cr.FillPreserve ();
 			
 					// gives the dock a "lifted" look and feel
-					cr.Color = new Cairo.Color (0, 0, 0, .6);
+					cr.Color = new Cairo.Color (0, 0, 0, .6 * alpha);
 					cr.LineWidth = 1;
 					cr.Stroke ();
 			
 					cr.SetRoundedRectanglePath (1.5, 1.5, width - 3, height + 40, 5);
 					LinearGradient lg = new LinearGradient (0, 1.5, 0, 10);
-					lg.AddColorStop (0, new Cairo.Color (1, 1, 1, .4));
+					lg.AddColorStop (0, new Cairo.Color (1, 1, 1, .4 * alpha));
 					lg.AddColorStop (1, new Cairo.Color (1, 1, 1, 0));
 					cr.Pattern = lg;
 					cr.LineWidth = 1;
 
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	2009-06-19 04:30:03 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	2009-08-28 01:51:26 +0000
@@ -95,6 +95,7 @@
 			autohide_combo.AppendText (((AutohideType) 0).ToString ());
 			autohide_combo.AppendText (((AutohideType) 1).ToString ());
 			autohide_combo.AppendText (((AutohideType) 2).ToString ());
+			autohide_combo.AppendText (((AutohideType) 3).ToString ());
 			autohide_combo.Active = (int) DockPreferences.AutohideType;
 			
 			BuildDocklets ();
 
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Utilities/AutohideType.cs'
--- Do.Interface.Linux.Docky/src/Docky.Utilities/AutohideType.cs	2009-04-27 20:42:27 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Utilities/AutohideType.cs	2009-08-28 01:51:26 +0000
@@ -26,5 +26,6 @@
 		None = 0,
 		Autohide,
 		Intellihide,
+		Intellifade,
 	}
 }
 
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs'
--- Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	2009-08-28 06:46:50 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	2009-09-03 04:38:19 +0000
@@ -68,6 +68,8 @@
 				SetZoomEnabled ((bool)e.Value);
 			if (e.Key == "IconSize")
 				SetIconSize ((int)e.Value);
+			if (e.Key == "IntellifadeOpacity")
+				SetIntellifadeOpacity ((double)e.Value);
 			if (e.Key == "SummonTime")
 				SetSummonTime (new TimeSpan (0, 0, 0, 0, (int)e.Value));
 			if (e.Key == "AutomaticIcons")
@@ -188,6 +190,25 @@
 			get { return ZoomPercent; }
 		}
 		
+		static double intellifade_opacity = prefs.Get ("IntellifadeOpacity", 0.4);
+		public static double IntellifadeOpacity {
+			get { return intellifade_opacity; }
+			set {
+				if (SetIntellifadeOpacity (value))
+					prefs.Set ("IntellifadeOpacity", value);
+			}
+		}
+		static bool SetIntellifadeOpacity (double val)
+		{
+			if (val < 0)
+				val = 0;
+			if (val > 1)
+				val = 1;
+			if (intellifade_opacity == val) return false;
+			intellifade_opacity = val;
+			return true;
+		}
+		
 		public static bool AutoHide {
 			get { return AutohideType != AutohideType.None; }
 		}