Merge lp:~jassmith/do/intellihide into lp:do

[Jason Smith]

[Jason Smith (jassmith)]

Implements a much better hiding behavior called "intellihide" which is similar to autohide except that it only hides when its "in the way" thus keeping docky visible when there is nothing else present.

Further this branch removes the remaining repositioning code as it conflicts with intellihide and is generally unneeded and causes all sorts of headaches.

Features Added:
-Intellihide

Features Replaced:
-Repositing Window (not user visible)
-Allow Window Overlap
-Autohide toggle on do dock item

[lp:~jassmith/do/intellihide]

1122. By Jason Smith on 2009-04-27

Handle window detection on a reconfigure properly

=== modified file 'Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp'
--- Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp	2009-04-20 04:49:28 +0000
+++ Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp	2009-04-27 20:42:27 +0000
@@ -90,6 +90,7 @@
     <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Interface/DockyConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/Docky.Interface.DockyConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Docky.Utilities/AutohideType.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

=== modified file 'Do.Interface.Linux.Docky/Makefile.am'
--- Do.Interface.Linux.Docky/Makefile.am	2009-04-20 04:49:28 +0000
+++ Do.Interface.Linux.Docky/Makefile.am	2009-04-27 20:42:27 +0000
@@ -68,6 +68,7 @@
 	src/Docky.Interface/TextRenderContext.cs \
 	src/Docky.Interface/UpdateRequestArgs.cs \
 	src/Docky.Interface/Util.cs \
+	src/Docky.Utilities/AutohideType.cs \
 	src/Docky.Utilities/DockOrientation.cs \
 	src/Docky.Utilities/DockPreferences.cs \
 	src/Docky.Utilities/GtkUtils.cs

=== modified file 'Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs'
--- Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs	2009-04-21 02:15:39 +0000
+++ Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs	2009-04-27 20:42:27 +0000
@@ -23,9 +23,9 @@
         
         private Gtk.HBox hbox8;
         
-        private Gtk.CheckButton autohide_checkbutton;
+        private Gtk.Label orientation_label1;
         
-        private Gtk.CheckButton window_overlap_checkbutton;
+        private Gtk.ComboBox autohide_combo;
         
         private Gtk.HBox hbox9;
         
@@ -87,28 +87,24 @@
             // Container child vbox2.Gtk.Box+BoxChild
             this.hbox8 = new Gtk.HBox();
             this.hbox8.Name = "hbox8";
-            this.hbox8.Homogeneous = true;
             this.hbox8.Spacing = 6;
             // Container child hbox8.Gtk.Box+BoxChild
-            this.autohide_checkbutton = new Gtk.CheckButton();
-            this.autohide_checkbutton.CanFocus = true;
-            this.autohide_checkbutton.Name = "autohide_checkbutton";
-            this.autohide_checkbutton.Label = Mono.Unix.Catalog.GetString("Automatically Hide");
-            this.autohide_checkbutton.DrawIndicator = true;
-            this.autohide_checkbutton.UseUnderline = true;
-            this.hbox8.Add(this.autohide_checkbutton);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox8[this.autohide_checkbutton]));
+            this.orientation_label1 = new Gtk.Label();
+            this.orientation_label1.Name = "orientation_label1";
+            this.orientation_label1.LabelProp = Mono.Unix.Catalog.GetString("Automatic Hiding:");
+            this.hbox8.Add(this.orientation_label1);
+            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox8[this.orientation_label1]));
             w4.Position = 0;
+            w4.Expand = false;
+            w4.Fill = false;
             // Container child hbox8.Gtk.Box+BoxChild
-            this.window_overlap_checkbutton = new Gtk.CheckButton();
-            this.window_overlap_checkbutton.CanFocus = true;
-            this.window_overlap_checkbutton.Name = "window_overlap_checkbutton";
-            this.window_overlap_checkbutton.Label = Mono.Unix.Catalog.GetString("Allow Window Overlap");
-            this.window_overlap_checkbutton.DrawIndicator = true;
-            this.window_overlap_checkbutton.UseUnderline = true;
-            this.hbox8.Add(this.window_overlap_checkbutton);
-            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox8[this.window_overlap_checkbutton]));
+            this.autohide_combo = Gtk.ComboBox.NewText();
+            this.autohide_combo.Name = "autohide_combo";
+            this.hbox8.Add(this.autohide_combo);
+            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox8[this.autohide_combo]));
             w5.Position = 1;
+            w5.Expand = false;
+            w5.Fill = false;
             this.vbox2.Add(this.hbox8);
             Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox8]));
             w6.Position = 1;
@@ -239,8 +235,7 @@
             }
             this.Hide();
             this.orientation_combobox.Changed += new System.EventHandler(this.OnOrientationComboboxChanged);
-            this.autohide_checkbutton.Toggled += new System.EventHandler(this.OnAutohideCheckbuttonToggled);
-            this.window_overlap_checkbutton.Toggled += new System.EventHandler(this.OnWindowOverlapCheckbuttonToggled);
+            this.autohide_combo.Changed += new System.EventHandler(this.OnAutohideComboChanged);
             this.zoom_checkbutton.Toggled += new System.EventHandler(this.OnZoomCheckbuttonToggled);
             this.advanced_indicators_checkbutton.Toggled += new System.EventHandler(this.OnAdvancedIndicatorsCheckbuttonToggled);
             this.zoom_scale.FormatValue += new Gtk.FormatValueHandler(this.OnZoomScaleFormatValue);

=== modified file 'Do.Interface.Linux.Docky/gtk-gui/gui.stetic'
--- Do.Interface.Linux.Docky/gtk-gui/gui.stetic	2009-04-21 02:15:39 +0000
+++ Do.Interface.Linux.Docky/gtk-gui/gui.stetic	2009-04-27 20:42:27 +0000
@@ -9,9 +9,9 @@
     <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
     <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <widget-library name="../../Do.Interface.Wink/bin/Debug/Do.Interface.Wnck.dll" />
-    <widget-library name="../bin/Debug/Do.Interface.Linux.Docky.dll" internal="true" />
     <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
     <widget-library name="../../Do.Interface.Linux.AnimationBase/bin/Debug/Do.Interface.Linux.AnimationBase.dll" />
+    <widget-library name="../bin/Debug/Do.Interface.Linux.Docky.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="Docky.Interface.DockyConfigurationWidget" design-size="376 347">
     <property name="MemberName" />
@@ -61,36 +61,31 @@
         <child>
           <widget class="Gtk.HBox" id="hbox8">
             <property name="MemberName" />
-            <property name="Homogeneous">True</property>
             <property name="Spacing">6</property>
             <child>
-              <widget class="Gtk.CheckButton" id="autohide_checkbutton">
+              <widget class="Gtk.Label" id="orientation_label1">
                 <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="Label" translatable="yes">Automatically Hide</property>
-                <property name="DrawIndicator">True</property>
-                <property name="HasLabel">True</property>
-                <property name="UseUnderline">True</property>
-                <signal name="Toggled" handler="OnAutohideCheckbuttonToggled" />
+                <property name="LabelProp" translatable="yes">Automatic Hiding:</property>
               </widget>
               <packing>
                 <property name="Position">0</property>
                 <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="Gtk.CheckButton" id="window_overlap_checkbutton">
+              <widget class="Gtk.ComboBox" id="autohide_combo">
                 <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="Label" translatable="yes">Allow Window Overlap</property>
-                <property name="DrawIndicator">True</property>
-                <property name="HasLabel">True</property>
-                <property name="UseUnderline">True</property>
-                <signal name="Toggled" handler="OnWindowOverlapCheckbuttonToggled" />
+                <property name="IsTextCombo">True</property>
+                <property name="Items" translatable="yes" />
+                <signal name="Changed" handler="OnAutohideComboChanged" />
               </widget>
               <packing>
                 <property name="Position">1</property>
                 <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
               </packing>
             </child>
           </widget>

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockAnimationState.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockAnimationState.cs	2009-03-02 05:26:10 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockAnimationState.cs	2009-04-27 20:42:27 +0000
@@ -34,6 +34,7 @@
 		Zoom,
 		Bounce,
 		Painter,
+		Summon,
 		IconInsert,
 		UrgencyChanged,
 		InputModeChanged,

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-04-26 21:00:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-04-27 20:42:27 +0000
@@ -26,6 +26,7 @@
 using Gtk;
 
 using Do.Platform;
+using Do.Interface.Wink;
 using Do.Interface.Xlib;
 
 using Docky.Core;
@@ -57,6 +58,7 @@
 		DateTime interface_change_time = new DateTime (0);
 		DateTime last_draw_timeout = new DateTime (0);
 		DateTime cursor_update = new DateTime (0);
+		DateTime showhide_time = new DateTime (0);
 		
 		bool disposed;
 		
@@ -98,7 +100,7 @@
 				uint[] values = new uint[12];
 				Gdk.Rectangle geo = LayoutUtils.MonitorGemonetry ();
 				
-				if (DockPreferences.AutoHide || DockPreferences.AllowOverlap)
+				if (DockPreferences.AutohideType != AutohideType.None)
 					return values;
 				
 				switch (DockPreferences.Orientation) {
@@ -168,7 +170,7 @@
 					dockRegion.Inflate (0, (int) (IconSize * (DockPreferences.ZoomPercent - 1)) + 22);
 					CursorIsOverDockArea = dockRegion.Contains (cursor);
 				} else {
-					if (DockPreferences.AutoHide) {
+					if (Hidden) {
 						switch (DockPreferences.Orientation) {
 						case DockOrientation.Bottom:
 							dockRegion.Y += dockRegion.Height - 1;
@@ -183,11 +185,21 @@
 					CursorIsOverDockArea = dockRegion.Contains (cursor);
 				}
 				
+				bool codChange = CursorIsOverDockArea != cursorIsOverDockArea;
 				// When we change over this boundry, it will normally trigger an animation, we need to be sure to catch it
-				if (CursorIsOverDockArea != cursorIsOverDockArea) {
+				if (codChange) {
 					ResetCursorTimer ();
 					enter_time = DateTime.UtcNow;
 					AnimatedDraw ();
+					switch (DockPreferences.AutohideType) {
+					case AutohideType.Autohide:
+						showhide_time = enter_time;
+						break;
+					case AutohideType.Intellihide:
+						if (WindowIntersectingOther)
+							showhide_time = enter_time;
+						break;
+					}
 				}
 
 				DragCursorUpdate ();
@@ -200,6 +212,20 @@
 			}
 		}
 		
+		IEnumerable<Gdk.Window> WindowStack {
+			get {
+				try {
+					return Screen.WindowStack;
+				} catch { 
+					try {
+						return Wnck.Screen.Default.WindowsStacked.Select (wnk => Gdk.Window.ForeignNew ((uint) wnk.Xid));
+					} catch {
+						return null;
+					}
+				}
+			}
+		}
+		
 		public DockArea (DockWindow window) : base ()
 		{
 			this.window = window;
@@ -317,7 +343,8 @@
 			                             () => DockItems.Any (di => DateTime.UtcNow - di.AttentionRequestStartTime < BounceTime));
 			
 			AnimationState.AddCondition (Animations.InputModeChanged,
-			                             () => DateTime.UtcNow - interface_change_time < SummonTime);
+			                             () => DateTime.UtcNow - interface_change_time < SummonTime || 
+			                             DateTime.UtcNow - showhide_time < SummonTime);
 		}
 
 		void HandleItemNeedsUpdate (object sender, UpdateRequestArgs args)
@@ -546,12 +573,11 @@
 			Display.GetPointer (out screen, out x, out y, out mod);
 			
 			if (screen == Screen) {
-				Gdk.Rectangle geo, hide_offset;
+				Gdk.Rectangle geo;
 				window.GetBufferedPosition (out geo.X, out geo.Y);
-				window.WindowHideOffset (out hide_offset.X, out hide_offset.Y);
 
-				x -= geo.X - hide_offset.X;
-				y -= geo.Y - hide_offset.Y;
+				x -= geo.X;
+				y -= geo.Y;
 			} else {
 				x = -4000;
 				y = -4000;
@@ -686,17 +712,16 @@
 		
 		void SetIconRegions ()
 		{
-			Gdk.Rectangle pos, area, offset;
+			Gdk.Rectangle pos, area;
 			window.GetPosition (out pos.X, out pos.Y);
 			window.GetSize (out pos.Width, out pos.Height);
 			
-			window.WindowHideOffset (out offset.X, out offset.Y);
 			// we use geo here instead of our position for the Y value because we know the parent window
 			// may offset us when hidden. This is not desired...
 			for (int i = 0; i < DockItems.Count; i++) {
 				Gdk.Point position = PositionProvider.IconUnzoomedPosition (i);
-				area = new Gdk.Rectangle (pos.X + (position.X - IconSize / 2) - offset.X,
-				                          pos.Y + (position.Y - IconSize / 2) - offset.Y,
+				area = new Gdk.Rectangle (pos.X + (position.X - IconSize / 2),
+				                          pos.Y + (position.Y - IconSize / 2),
 				                          IconSize,
 				                          IconSize);
 				DockItems [i].SetIconRegion (area);
@@ -715,7 +740,7 @@
 				offset = GetDockArea ().Height;
 				offset = offset * 2 + 10;
 			} else {
-				if (DockPreferences.AutoHide && !drag_resizing) {
+				if (Hidden && !drag_resizing) {
 					// setting the offset to 2 will trigger the parent window to unhide us if we are hidden.
 					if (AnimationState [Animations.UrgencyChanged])
 						offset = 2;

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_DragAndDrop.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_DragAndDrop.cs	2009-04-18 03:12:46 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_DragAndDrop.cs	2009-04-27 20:42:27 +0000
@@ -132,16 +132,7 @@
 			} else {
 				Gdk.Point local_cursor = Cursor.RelativePointToRootPoint (window);
 	
-				IEnumerable<Gdk.Window> windows;
-				try {
-					windows = Screen.WindowStack;
-				} catch { 
-					try {
-						windows = Wnck.Screen.Default.WindowsStacked.Select (wnk => Gdk.Window.ForeignNew ((uint) wnk.Xid));
-					} catch {
-						return;
-					}
-				}
+				IEnumerable<Gdk.Window> windows = WindowStack;
 
 				foreach (Gdk.Window w in windows.Reverse ()) {
 					if (w == null || w == window.GdkWindow || !w.IsVisible)

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-04-08 00:57:55 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-04-27 20:42:27 +0000
@@ -26,6 +26,7 @@
 
 using Do.Interface;
 using Do.Interface.CairoUtils;
+using Do.Interface.Wink;
 
 using Docky.Core;
 using Docky.Utilities;
@@ -49,7 +50,7 @@
 		const int UrgentIndicatorSize = 12;
 		
 		Dictionary<IDockPainter, Surface> painter_surfaces;
-		bool fast_render_fail, first_render_set;
+		bool fast_render_fail, first_render_set, last_intersect;
 		
 		Surface backbuffer, input_area_buffer, dock_icon_buffer;
 		Surface indicator, urgent_indicator;
@@ -97,6 +98,21 @@
 			}
 		}
 		
+		bool Hidden {
+			get {
+				bool hidden = false;
+				switch (DockPreferences.AutohideType) {
+				case AutohideType.Autohide:
+					hidden = !CursorIsOverDockArea;
+					break;
+				case AutohideType.Intellihide:
+					hidden = !CursorIsOverDockArea && WindowIntersectingOther;
+					break;
+				}
+				return hidden;
+			}
+		}
+		
 		/// <value>
 		/// Icon Size used for the dock
 		/// </value>
@@ -137,6 +153,24 @@
 		double PainterOpacity {
 			get { return 1 - DockIconOpacity; }
 		}
+		
+		bool WindowIntersectingOther {
+			get {
+				bool intersect = false;
+				try {
+					Gdk.Rectangle adjustedDockArea = MinimumDockArea.RelativeRectangleToRootPoint (window);
+					adjustedDockArea.Inflate (-2, -2);
+					intersect = ScreenUtils.ActiveViewport.Windows ().Any (w => w.EasyGeometry ().IntersectsWith (adjustedDockArea));
+				} catch {
+				}
+				if (intersect != last_intersect && DateTime.UtcNow - showhide_time > SummonTime) {
+					showhide_time = DateTime.UtcNow;
+					AnimatedDraw ();
+				}
+				last_intersect = intersect;
+				return intersect;
+			}
+		}
 
 		//// <value>
 		/// The overall offset of the dock as a whole
@@ -145,7 +179,7 @@
 			get {
 				double offset = 0;
 				// we never hide in these conditions
-				if (!DockPreferences.AutoHide || drag_resizing || PainterOpacity == 1) {
+				if (DockPreferences.AutohideType == AutohideType.None || drag_resizing || PainterOpacity == 1) {
 					if ((RenderTime - FirstRenderTime) > SummonTime)
 						return 0;
 					offset = 1 - Math.Min (1, (DateTime.UtcNow - FirstRenderTime).TotalMilliseconds / SummonTime.TotalMilliseconds);
@@ -153,10 +187,10 @@
 				}
 
 				if (PainterOpacity > 0) {
-					if (CursorIsOverDockArea) {
+					if (!Hidden) {
 						return 0;
 					} else {
-						offset = Math.Min (1, (RenderTime - enter_time).TotalMilliseconds / 
+						offset = Math.Min (1, (RenderTime - showhide_time).TotalMilliseconds / 
 						                   SummonTime.TotalMilliseconds);
 						offset = Math.Min (offset, Math.Min (1, 
 						                                     (RenderTime - interface_change_time)
@@ -166,9 +200,9 @@
 					if (PainterOverlayVisible)
 						offset = 1 - offset;
 				} else {
-					offset = Math.Min (1, (RenderTime - enter_time).TotalMilliseconds / 
+					offset = Math.Min (1, (RenderTime - showhide_time).TotalMilliseconds / 
 					                   SummonTime.TotalMilliseconds);
-					if (CursorIsOverDockArea)
+					if (!Hidden)
 						offset = 1 - offset;
 				}
 				return (int) (offset * PositionProvider.DockHeight * 1.5);
@@ -186,7 +220,7 @@
 				double zoom = Math.Min (1, (RenderTime - enter_time).TotalMilliseconds / 
 					                 BaseAnimationTime.TotalMilliseconds);
 				if (CursorIsOverDockArea) {
-					if (DockPreferences.AutoHide)
+					if (DockPreferences.AutohideType == AutohideType.Autohide)
 						zoom = 1;
 				} else {
 					zoom = 1 - zoom;
@@ -225,7 +259,7 @@
 				cr.PaintWithAlpha (PainterOpacity);
 			}
 			
-			bool isNotSummonTransition = PainterOpacity == 0 || CursorIsOverDockArea || !DockPreferences.AutoHide;
+			bool isNotSummonTransition = PainterOpacity == 0 || !Hidden || !DockPreferences.AutoHide;
 			if (DockIconOpacity > 0 && isNotSummonTransition) {
 				if (dock_icon_buffer == null)
 					dock_icon_buffer = cr.Target.CreateSimilar (cr.Target.Content, Width, Height);
@@ -598,7 +632,7 @@
 
 		protected override bool OnExposeEvent(EventExpose evnt)
 		{
-			if (!IsDrawable || window.IsRepositionHidden)
+			if (!IsDrawable)
 				return false;
 			
 			RenderTime = DateTime.UtcNow;

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-04-26 21:00:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-04-27 20:42:27 +0000
@@ -50,7 +50,6 @@
 		IDoController controller;
 		Gdk.Rectangle current_mask;
 		uint strut_timer;
-		bool is_repositioned_hidden;
 		bool presented;
 		int buffer_x, buffer_y;
 		int buffer_width, buffer_height;
@@ -58,10 +57,6 @@
 		public new string Name {
 			get { return "Docky"; }
 		}
-
-		public bool IsRepositionHidden {
-			get { return is_repositioned_hidden; }
-		}
 		
 		public IDoController Controller {
 			get { return controller; }
@@ -172,17 +167,6 @@
 			
 			(cr as IDisposable).Dispose ();
 			pixmap.Dispose ();
-			
-			if (area.Height == 1) {
-				GLib.Timeout.Add (500, () => {
-					if (current_mask.Height == 1)
-						HideReposition ();
-					return false;
-				});
-			} else {
-				if (is_repositioned_hidden)
-					Reposition ();
-			}
 		}
 		
 		protected override bool OnButtonReleaseEvent (Gdk.EventButton evnt)
@@ -250,54 +234,7 @@
 				break;
 			}
 			
-			if (Display != null)
-				Display.Sync ();
-			
 			results.SlideFromBottom = DockPreferences.Orientation == DockOrientation.Bottom;
-			is_repositioned_hidden = false;
-		}
-		
-		void HideReposition ()
-		{
-			Gdk.Rectangle geo, main;
-			
-			GetSize (out main.Width, out main.Height);
-			geo = LayoutUtils.MonitorGemonetry ();
-
-			switch (DockPreferences.Orientation) {
-			case DockOrientation.Bottom:
-				Move ((geo.X + geo.Width / 2) - main.Width / 2, geo.Y + geo.Height);
-				break;
-			case DockOrientation.Top:
-				Move (geo.X, geo.Y - main.Height);
-				break;
-			}
-
-			if (Display != null)
-				Display.Sync ();
-			
-			is_repositioned_hidden = true;
-		}
-		
-		public void WindowHideOffset (out int x, out int y)
-		{
-			x = y = 0;
-
-			Gdk.Rectangle main, geo;
-			main.Width = dock_area.Width;
-			main.Height = dock_area.Height;
-			GetBufferedPosition (out main.X, out main.Y);
-			geo = LayoutUtils.MonitorGemonetry ();
-			
-			
-			switch (DockPreferences.Orientation) {
-			case DockOrientation.Bottom:
-				y = main.Y - ((geo.Y + geo.Height) - main.Height);
-				return;
-			case DockOrientation.Top:
-				y = main.Y - geo.Y;
-				return;
-			}
 		}
 				
 		public void GetBufferedPosition (out int x, out int y)

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs	2009-04-21 16:10:39 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs	2009-04-27 20:42:27 +0000
@@ -89,9 +89,6 @@
 		{
 			yield return new SeparatorMenuButtonArgs ();
 			
-			yield return new SimpleMenuButtonArgs (() => DockPreferences.AutoHide = !DockPreferences.AutoHide, 
-			                                       Catalog.GetString ("Automatically Hide"), DockPreferences.AutoHide ? EnableIcon : DisableIcon).AsDark ();
-
 			yield return new SimpleMenuButtonArgs (() => DockPreferences.ZoomEnabled = !DockPreferences.ZoomEnabled, 
 			                                       Catalog.GetString ("Zoom Icons"), DockPreferences.ZoomEnabled ? EnableIcon : DisableIcon).AsDark ();
 			

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	2009-04-22 03:50:29 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	2009-04-27 20:42:27 +0000
@@ -89,14 +89,17 @@
 			zoom_width_scale.Value = DockPreferences.ZoomSize;
 			
 			advanced_indicators_checkbutton.Active = DockPreferences.IndicateMultipleWindows;
-			autohide_checkbutton.Active = DockPreferences.AutoHide;
-			window_overlap_checkbutton.Active = DockPreferences.AllowOverlap;
 			zoom_checkbutton.Active = DockPreferences.ZoomEnabled;
 			
 			orientation_combobox.AppendText (DockOrientation.Bottom.ToString ());
 			orientation_combobox.AppendText (DockOrientation.Top.ToString ());
 			orientation_combobox.Active = DockPreferences.Orientation == DockOrientation.Bottom ? 0 : 1;
 			
+			autohide_combo.AppendText (((AutohideType) 0).ToString ());
+			autohide_combo.AppendText (((AutohideType) 1).ToString ());
+			autohide_combo.AppendText (((AutohideType) 2).ToString ());
+			autohide_combo.Active = (int) DockPreferences.AutohideType;
+			
 			BuildDocklets ();
 			
 			SetSensitivity ();
@@ -171,23 +174,17 @@
 			DockPreferences.ZoomEnabled = zoom_checkbutton.Active;
 		}
 
-		protected virtual void OnWindowOverlapCheckbuttonToggled (object sender, System.EventArgs e)
-		{
-			if (setup) return;
-			DockPreferences.AllowOverlap = window_overlap_checkbutton.Active;
-		}
-
-		protected virtual void OnAutohideCheckbuttonToggled (object sender, System.EventArgs e)
-		{
-			if (setup) return;
-			DockPreferences.AutoHide = autohide_checkbutton.Active;
-		}
-
 		protected virtual void OnOrientationComboboxChanged (object sender, System.EventArgs e)
 		{
 			if (setup) return;
 			DockPreferences.Orientation = (DockOrientation) orientation_combobox.Active;
 		}
+		
+		protected virtual void OnAutohideComboChanged (object sender, System.EventArgs e)
+		{
+			if (setup) return;
+			DockPreferences.AutohideType = (AutohideType) autohide_combo.Active;
+		}
 
 		protected virtual void OnZoomWidthScaleValueChanged (object sender, System.EventArgs e)
 		{

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/LayoutUtils.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/LayoutUtils.cs	2009-02-26 07:55:16 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/LayoutUtils.cs	2009-04-27 20:42:27 +0000
@@ -64,6 +64,13 @@
 		{
 			return monitor_geo;
 		}
+		
+		public static Gdk.Rectangle RelativeRectangleToRootPoint (this Gdk.Rectangle relativePoint, Gtk.Window window)
+		{
+			Gdk.Rectangle main;
+			window.GetPosition (out main.X, out main.Y);
+			return new Gdk.Rectangle (main.X + relativePoint.X, main.Y + relativePoint.Y, relativePoint.Width, relativePoint.Height);
+		}
 
 		public static Gdk.Point RelativePointToRootPoint (this Gdk.Point relativePoint, Gtk.Window window)
 		{

=== added file 'Do.Interface.Linux.Docky/src/Docky.Utilities/AutohideType.cs'
--- Do.Interface.Linux.Docky/src/Docky.Utilities/AutohideType.cs	1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Utilities/AutohideType.cs	2009-04-27 20:42:27 +0000
@@ -0,0 +1,30 @@
+//  
+//  Copyright (C) 2009 GNOME Do
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+
+namespace Docky
+{
+	
+	
+	public enum AutohideType
+	{
+		None = 0,
+		Autohide,
+		Intellihide,
+	}
+}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs'
--- Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	2009-04-23 01:09:57 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	2009-04-27 20:42:27 +0000
@@ -153,33 +153,8 @@
 			get { return ZoomPercent; }
 		}
 		
-		static bool autohide = prefs.Get ("AutoHide", false);
 		public static bool AutoHide {
-			get { return autohide; }
-			set {
-				if (autohide == value)
-					return;
-				
-				prefs.Set ("AutoHide", value);
-				autohide = value;
-				if (AutohideChanged != null)
-					AutohideChanged ();
-			}
-		}
-
-		static bool allow_overlap = prefs.Get ("AllowWindowOverlap", false);
-		public static bool AllowOverlap {
-			get { return allow_overlap; }
-			set {
-				if (allow_overlap == value)
-					return;
-
-				prefs.Set ("AllowWindowOverlap", value);
-				allow_overlap = value;
-				
-				if (AllowOverlapChanged != null)
-					AllowOverlapChanged ();
-			}
+			get { return AutohideType != AutohideType.None; }
 		}
 		
 		static TimeSpan summon_time = new TimeSpan (0, 0, 0, 0, prefs.Get ("SummonTime", 100));
@@ -243,6 +218,19 @@
 					OrientationChanged ();
 			}
 		}
+		
+		static AutohideType hide = (AutohideType) Enum.Parse (typeof (AutohideType), prefs.Get ("AutohideType", AutohideType.None.ToString ()));
+		public static AutohideType AutohideType {
+			get { return hide; }
+			set {
+				if (hide == value)
+					return;
+				hide = value;
+				prefs.Set ("AutohideType", value.ToString ());
+				if (AutohideChanged != null)
+					AutohideChanged ();
+			}
+		}
 
 		#region blacklists
 		static List<string> item_blacklist = DeserializeBlacklist ();

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Utilities/GtkUtils.cs'
--- Do.Interface.Linux.Docky/src/Docky.Utilities/GtkUtils.cs	2009-02-13 00:19:29 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Utilities/GtkUtils.cs	2009-04-27 20:42:27 +0000
@@ -38,5 +38,13 @@
             self.Colormap = colormap;
             colormap.Dispose ();
 		}
+		
+		public static Gdk.Rectangle EasyGeometery (this Gdk.Window self)
+		{
+			Gdk.Rectangle rect;
+			int depth;
+			self.GetGeometry (out rect.X, out rect.Y, out rect.Width, out rect.Height, out depth);
+			return rect;
+		}
 	}
 }