Merge lp:~niklas-komani/do/docky_changes into lp:do

[Niklas Schnelle]

[Niklas Schnelle (niklas-komani)]

Sorry for creating yet another branch and starting/deleting a merge proposal, had it based on 0.8 instead of trunk, this is now changed.

Changes in this branch include:
- Elimination of several redundant LINQ queries in the GetClickAction Code
- Reworked GetClick Action to work on one window at a time to enable it to make better decisions
- Reworked PerformLogicalClick to have a more elegant struture with less Queries and to work at every window seperately to allow better decisions
- Added restore/minimize function overloads to WindowControl to make it possible to work on one window at a time

[Robert Dyer (psybers)]

Thank you for your effort, but we have started work on Docky 2 which is a standalone program. A lot of code was completely rewritten and the original Docky code will be leaving the GNOME Do codebase.

If youre still interested in Docky, try checking out lp:docky and submit patches against that. Note however that at this early state the codebase will be changing *very* rapidly, so merge proposals against it most likely will be outdated before we can even review them.

It's also possible the functionality you wanted exists already. :-)

review: Disapprove

[Niklas Schnelle (niklas-komani)]

Does it make sense to try to merge these changes in the 0.8 branch? If
not, how long do you guess will Docky 2 take to get to the level where
Docky is now?
I think GNOME Do and Docky are both absolutely awesome software, will
Docky 2 still integrate the GNOME Do functionality? I think this feature
is what really made Docky different then all those other Docks.
greetings Niklas

[Jason Smith (jassmith)]

Docky 2 will reach feature parity with Docky very shortly

On Sun, 2009-09-27 at 16:39 +0000, Niklas Schnelle wrote:
> Does it make sense to try to merge these changes in the 0.8 branch? If
> not, how long do you guess will Docky 2 take to get to the level where
> Docky is now?
> I think GNOME Do and Docky are both absolutely awesome software, will
> Docky 2 still integrate the GNOME Do functionality? I think this feature
> is what really made Docky different then all those other Docks.
> greetings Niklas
>

[Chris Halse Rogers (raof)]

Docky has been removed from the Do codebase.

Unmerged revisions

1304. By Niklas Schnelle <niklas@niklas-iMac> on 2009-09-27

- Changed Window group minimizing/restoring to be more sane, especially
  if different windows of an application have a differing status
- Eliminated some LINQ queries on the way and added overloaded functions
  for restoring/minimizing a single window

=== modified file 'Do.Interface.Wink/src/Do.Interface.Wink/WindowControl.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/WindowControl.cs	2009-05-14 05:23:53 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/WindowControl.cs	2009-09-27 15:45:22 +0000
@@ -61,6 +61,21 @@
 		}
 		
 		/// <summary>
+		/// Minimizes this window if it is not minimized
+		/// </summary>
+		/// <param name="window">
+		/// A <see cref="Window"/>
+		/// </param>
+		public static void MinimizeWindows (Window window)
+		{
+			if (window.IsInViewport (window.Screen.ActiveWorkspace) && !window.IsMinimized) {
+				window.Minimize ();
+				System.Threading.Thread.Sleep (SleepTime);
+			}
+		}
+		
+		
+		/// <summary>
 		/// Minimizes every window in the list if it is not minimized
 		/// </summary>
 		/// <param name="windows">
@@ -77,6 +92,22 @@
 		}
 		
 		/// <summary>
+		/// Restores this window if it is minimized
+		/// </summary>
+		/// <param name="window">
+		/// A <see cref="Window"/>
+		/// </param>
+		public static void RestoreWindows (Window window)
+		{
+			if (window.IsInViewport (window.Screen.ActiveWorkspace) && window.IsMinimized) {
+				window.Unminimize (Gtk.Global.CurrentEventTime);
+				System.Threading.Thread.Sleep (SleepTime);
+			}
+		}
+		
+		
+		
+		/// <summary>
 		/// Restores every window in the list that is minimized
 		/// </summary>
 		/// <param name="windows">
 
=== modified file 'Do.Interface.Wink/src/Do.Interface.Wink/WindowUtils.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/WindowUtils.cs	2009-06-21 02:20:30 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/WindowUtils.cs	2009-09-27 15:45:22 +0000
@@ -219,18 +219,19 @@
 			last_update = DateTime.UtcNow;
 		}
 		
-		static ClickAction GetClickAction (IEnumerable<Window> windows)
+		static ClickAction GetClickAction (Window window)
 		{
-			if (!windows.Any ())
+			if (window==null)
 				return ClickAction.None;
 			
-			if (windows.Any (w => w.IsMinimized && w.IsInViewport (Wnck.Screen.Default.ActiveWorkspace)))
-				return ClickAction.Restore;
-			
-			if (windows.Any (w => w.IsActive && w.IsInViewport (Wnck.Screen.Default.ActiveWorkspace)))
-				return ClickAction.Minimize;
-			
-			return ClickAction.Focus;
+			if(window.IsInViewport (Wnck.Screen.Default.ActiveWorkspace)) {
+				if (window.IsMinimized )					
+					return ClickAction.Restore;				
+				else if (window.IsActive)
+					return ClickAction.Minimize;
+				else return ClickAction.Focus;			
+			}
+			return ClickAction.None;
 		}
 		#endregion
 		
@@ -421,32 +422,35 @@
 		{
 			List<Window> stack = new List<Window> (Wnck.Screen.Default.WindowsStacked);
 			windows = windows.OrderByDescending (w => stack.IndexOf (w));
-			
-			bool not_in_viewport = !windows.Any (w => !w.IsSkipTasklist && w.IsInViewport (w.Screen.ActiveWorkspace));
-			bool urgent = windows.Any (w => w.NeedsAttention ());
-			
-			if (not_in_viewport || urgent) {
-				foreach (Wnck.Window window in windows) {
-					if (urgent && !window.NeedsAttention ())
-						continue;
-					if (!window.IsSkipTasklist) {
-						WindowControl.IntelligentFocusOffViewportWindow (window, windows);
-						return;
-					}
-				}
-			}
-			
-			switch (GetClickAction (windows)) {
-			case ClickAction.Focus:
-				WindowControl.FocusWindows (windows);
-				break;
-			case ClickAction.Minimize:
-				WindowControl.MinimizeWindows (windows);
-				break;
-			case ClickAction.Restore:
-				WindowControl.RestoreWindows (windows);
-				break;
-			}
+					
+
+			foreach (Wnck.Window window in windows) {
+				if (window.NeedsAttention ())
+					WindowControl.FocusWindows (window);
+				
+				if (!window.IsSkipTasklist && !window.IsInViewport (window.Screen.ActiveWorkspace)) {
+					WindowControl.IntelligentFocusOffViewportWindow (window, windows);
+					return;
+				}
+
+				switch (GetClickAction (window)) {
+				case ClickAction.Focus:
+					WindowControl.FocusWindows (window);
+					break;
+				case ClickAction.Minimize:	
+					//We want to minimize all windows of the app if a window was focused
+					WindowControl.MinimizeWindows (windows);
+					return;
+				case ClickAction.Restore:
+					//We want to restore all windows of the app if a window was minimizes
+					WindowControl.RestoreWindows (windows);
+					//After restoring we want one of the windows to get the focus
+					//this will be the first in the descending stack
+					WindowControl.FocusWindows(windows);
+					return;
+				}
+			}
+
 		}
 		
 		#endregion