Merge lp:~niels-avonds/gala/gala-fixes into lp:gala

[Niels Avonds]

[Garden Gnome (gardengnome85)]

Patch looks good to me tested and works fine

[Garden Gnome (gardengnome85)]

review: Approve

[lp:~niels-avonds/gala/gala-fixes]

54. By Garden Gnome on 2012-06-04

fixes sellected workspace alignment issue

55. By Tom Beckmann on 2012-06-04

Fix the little jump when a window is repositioned to the center

56. By Danielle Foré on 2012-06-04

smoother workspace transition with ease in out sin

57. By Niels Avonds on 2012-06-04

move_window improvements to fix bug #1008649 and bug #1008653.

=== modified file 'src/Main.vala'
--- src/Main.vala	2012-06-04 14:03:33 +0000
+++ src/Main.vala	2012-06-04 18:34:22 +0000
@@ -185,13 +185,18 @@
 		
 		void move_window (Window? window, bool up)
 		{
-			if (window == null || window.is_on_all_workspaces ())
+			if (window == null)
 				return;
 			
 			var idx = screen.get_active_workspace ().index () + ((up)?-1:1);
-			window.change_workspace_by_index (idx, false, 
-				screen.get_display ().get_current_time ());
-			
+
+			if (idx < 0 || idx >= screen.n_workspaces)
+				return;
+
+			if (!window.is_on_all_workspaces ())
+				window.change_workspace_by_index (idx, false, 
+					screen.get_display ().get_current_time ());
+
 			screen.get_workspace_by_index (idx).activate_with_focus (window, 
 				screen.get_display ().get_current_time ());
 		}