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

[Jason Smith]

[Jason Smith (jassmith)]

Fixes bug where clock painter stops working after monitor switch

[David Siegel (djsiegel-deactivatedaccount)]

Looks great to me.

review: Approve

=== modified file 'Do.Interface.Linux.Docky/Makefile.am'
--- Do.Interface.Linux.Docky/Makefile.am	2009-03-04 20:41:38 +0000
+++ Do.Interface.Linux.Docky/Makefile.am	2009-03-05 05:00:17 +0000
@@ -59,7 +59,6 @@
 	src/Docky.Interface/IRightClickable.cs \
 	src/Docky.Interface/ItemPositionProvider.cs \
 	src/Docky.Interface/LayoutUtils.cs \
-	src/Docky.Interface/PainterService.cs \
 	src/Docky.Interface/PaintNeededArgs.cs \
 	src/Docky.Interface/UpdateRequestArgs.cs \
 	src/Docky.Interface/Util.cs \

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/PainterService.cs'
--- Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/PainterService.cs	2009-02-03 09:37:39 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/PainterService.cs	2009-03-05 05:00:17 +0000
@@ -17,6 +17,7 @@
 //
 
 using System;
+using System.Collections.Generic;
 
 using Do.Platform;
 
@@ -31,24 +32,59 @@
 	{
 		
 		
+		ICollection<IDockPainter> painters;
+		
 		#region IPainterService implementation
+		
+		public event EventHandler PainterHideRequest;
+		public event EventHandler PainterShowRequest;
+		
 		public void RegisterPainter (IDockPainter painter)
 		{
-			Log<PainterService>.Error ("Default Painter Services cannot register painters");
+			painters.Add (painter);
+			painter.ShowRequested += HandleShowRequested;
+			painter.HideRequested += HandleHideRequested;
+		}
+
+		void HandleHideRequested(object sender, EventArgs e)
+		{
+			IDockPainter painter = sender as IDockPainter;
+			if (painter == null || PainterHideRequest == null)
+				return;
+			
+			PainterHideRequest (sender, e);
+		}
+
+		void HandleShowRequested(object sender, EventArgs e)
+		{
+			IDockPainter painter = sender as IDockPainter;
+			if (painter == null || PainterShowRequest == null)
+				return;
+			
+			PainterShowRequest (sender, e);
+		}
+		
+		#endregion 
+		
+		public PainterService ()
+		{
+			painters = new List<IDockPainter> ();
 		}
 
 		#region IDisposable implementation 
 		
 		public void Dispose ()
 		{
+			DockServices.UnregisterService (this);
+			
+			foreach (IDockPainter painter in painters) {
+				painter.ShowRequested -= HandleShowRequested;
+				painter.HideRequested -= HandleHideRequested;
+				painter.Dispose ();
+			}
+			painters.Clear ();
 		}
 		
-		#endregion 
-		
-		
-		#endregion 
-		
-
-		
+		#endregion
 	}
 }

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Core/IPainterService.cs'
--- Do.Interface.Linux.Docky/src/Docky.Core/IPainterService.cs	2009-02-03 09:37:39 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Core/IPainterService.cs	2009-03-05 05:00:17 +0000
@@ -25,6 +25,10 @@
 	
 	public interface IPainterService : IDockService
 	{
+		event EventHandler PainterHideRequest;
+		
+		event EventHandler PainterShowRequest;
+		
 		void RegisterPainter (IDockPainter painter);
 	}
 }

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-04 16:10:30 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-05 05:34:14 +0000
@@ -123,8 +123,6 @@
 		
 		bool CursorIsOverDockArea {	get; set; }
 
-		PainterService PainterService { get; set; }
-
 		ModifierType CursorModifier { get; set; }
 		
 		ReadOnlyCollection<AbstractDockItem> DockItems { 
@@ -204,10 +202,6 @@
 			SetSize ();
 			SetSizeRequest (Width, Height);
 			
-			PainterService = new PainterService (this);
-			PainterService.BuildPainters ();
-			DockServices.RegisterService (PainterService);
-			
 			PositionProvider = new ItemPositionProvider (this);
 			
 			AnimationState = new DockAnimationState ();
@@ -253,6 +247,9 @@
 			DockServices.ItemsService.DockItemsChanged += OnDockItemsChanged;
 			DockServices.ItemsService.ItemNeedsUpdate += HandleItemNeedsUpdate;
 			DockPreferences.IconSizeChanged += HandleIconSizeChanged; 
+			
+			DockServices.PainterService.PainterShowRequest += HandlePainterShowRequest;
+			DockServices.PainterService.PainterHideRequest += HandlePainterHideRequest;
 
 			PopupMenu.Hidden += OnDockItemMenuHidden;
 			PopupMenu.Shown += OnDockItemMenuShown;
@@ -273,9 +270,14 @@
 			DockServices.ItemsService.DockItemsChanged -= OnDockItemsChanged;
 			DockServices.ItemsService.ItemNeedsUpdate -= HandleItemNeedsUpdate;
 			DockPreferences.IconSizeChanged -= HandleIconSizeChanged; 
+			
+			DockServices.PainterService.PainterShowRequest -= HandlePainterShowRequest;
+			DockServices.PainterService.PainterHideRequest -= HandlePainterHideRequest;
 
 			PopupMenu.Hidden -= OnDockItemMenuHidden;
 			PopupMenu.Shown -= OnDockItemMenuShown;
+			
+			Services.Core.UniverseInitialized -= HandleUniverseInitialized;
 		}
 		
 		void BuildAnimationStateEngine ()
@@ -311,6 +313,7 @@
 		void HandleUniverseInitialized(object sender, EventArgs e)
 		{
 			GLib.Timeout.Add (2000, delegate {
+				DockServices.ItemsService.ForceUpdate ();
 				SetIconRegions ();
 				return false;
 			});
@@ -336,6 +339,51 @@
 			AnimatedDraw ();
 		}
 		
+		void HandlePainterHideRequest(object sender, EventArgs e)
+		{
+			IDockPainter painter = sender as IDockPainter;
+			if (Painter != painter)
+				return;
+
+			Painter = null;
+			PainterOverlayVisible = false;
+			interface_change_time = DateTime.UtcNow;
+
+			SetParentInputMask ();
+			AnimatedDraw ();
+
+			GLib.Timeout.Add (500, () => { 
+				DockServices.ItemsService.ForceUpdate (); 
+				return false; 
+			});
+
+			window.UnpresentWindow ();
+			RegisterGtkDragSource ();
+		}
+
+		void HandlePainterShowRequest(object sender, EventArgs e)
+		{
+			IDockPainter painter = sender as IDockPainter;
+			if (Painter == painter)
+				return;
+			
+			if (Painter == null || Painter.Interruptable) {
+				if (Painter != null)
+					Painter.Interrupt ();
+				Painter = painter;
+				PainterOverlayVisible = true;
+				interface_change_time = DateTime.UtcNow;
+
+				SetParentInputMask ();
+				AnimatedDraw ();
+			} else {
+				painter.Interrupt ();
+			}
+			
+			window.PresentWindow ();
+			UnregisterGtkDragSource ();
+		}
+		
 		void ResetCursorTimer ()
 		{
 			if (disposed)
@@ -622,50 +670,6 @@
 			}
 		}
 
-		public bool RequestShowPainter (IDockPainter painter)
-		{
-			if (Painter == painter)
-				return true;
-			
-			if (Painter == null || Painter.Interruptable) {
-				if (Painter != null)
-					Painter.Interrupt ();
-				Painter = painter;
-				PainterOverlayVisible = true;
-				interface_change_time = DateTime.UtcNow;
-
-				SetParentInputMask ();
-				AnimatedDraw ();
-			} else {
-				return false;
-			}
-			window.PresentWindow ();
-			UnregisterGtkDragSource ();
-			return true;
-		}
-
-		public bool RequestHidePainter (IDockPainter painter)
-		{
-			if (Painter != painter)
-				return false;
-
-			Painter = null;
-			PainterOverlayVisible = false;
-			interface_change_time = DateTime.UtcNow;
-
-			SetParentInputMask ();
-			AnimatedDraw ();
-
-			GLib.Timeout.Add (500, () => { 
-				DockServices.ItemsService.ForceUpdate (); 
-				return false; 
-			});
-
-			window.UnpresentWindow ();
-			RegisterGtkDragSource ();
-			return true;
-		}
-
 		void InterruptPainter ()
 		{
 			if (Painter == null || !Painter.Interruptable) return;
@@ -713,9 +717,6 @@
 				Painter.PaintNeeded -= HandlePaintNeeded;
 			}
 			
-			DockServices.UnregisterService (PainterService);
-			PainterService.Dispose ();
-
 			window = null;
 			
 			if (cursor_timer > 0)

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-03-03 13:59:44 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-03-05 05:00:17 +0000
@@ -77,6 +77,8 @@
 
 			interop_service = new DoInteropService (controller);
 			Core.DockServices.RegisterService (interop_service);
+			
+			Core.DockServices.PainterService.RegisterPainter (new Painters.SummonModeRenderer ());
 
 			RegisterEvents ();
 			Build ();

=== removed file 'Do.Interface.Linux.Docky/src/Docky.Interface/PainterService.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/PainterService.cs	2009-02-23 06:09:46 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/PainterService.cs	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-// PainterService.cs
-// 
-// 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;
-using System.Collections.Generic;
-
-using Docky.Core;
-
-namespace Docky.Interface
-{
-	
-	
-	internal class PainterService : IPainterService
-	{
-		ICollection<IDockPainter> painters;
-		DockArea parent;
-		
-		#region IPainterService implementation
-
-		public void RegisterPainter (IDockPainter painter)
-		{
-			painters.Add (painter);
-			painter.ShowRequested += HandleShowRequested;
-			painter.HideRequested += HandleHideRequested;
-		}
-
-		void HandleHideRequested(object sender, EventArgs e)
-		{
-			IDockPainter painter = sender as IDockPainter;
-			if (painter == null)
-				return;
-			
-			parent.RequestHidePainter (painter);
-		}
-
-		void HandleShowRequested(object sender, EventArgs e)
-		{
-			IDockPainter painter = sender as IDockPainter;
-			if (painter == null)
-				return;
-			
-			bool shown = parent.RequestShowPainter (painter);
-			if (!shown)
-				painter.Interrupt ();
-		}
-		
-		#endregion 
-		
-		internal PainterService (DockArea parent)
-		{
-			this.parent = parent;
-			painters = new List<IDockPainter> ();
-		}
-
-		public void BuildPainters ()
-		{
-			RegisterPainter (new Painters.SummonModeRenderer ());
-		}
-
-		#region IDisposable implementation 
-		
-		public void Dispose ()
-		{
-			DockServices.UnregisterService (this);
-			
-			foreach (IDockPainter painter in painters) {
-				painter.ShowRequested -= HandleShowRequested;
-				painter.HideRequested -= HandleHideRequested;
-				painter.Dispose ();
-			}
-			painters.Clear ();
-			
-			parent = null;
-		}
-		
-		#endregion 
-		
-	}
-}