Merge lp:~winglot/gala/fix-1213460 into lp:gala

[Cody Garver]

windowswitcher: hide minimized windows again after alt-tabbing

[Tigran Gabrielyan (tigrangab)]

This creates a new issue when choosing a minimized window from overview.

It both shows the uniminimize animation and the zoom from the overview closing.

[Tigran Gabrielyan (tigrangab)]

Disregard my last comment. It happens with gala trunk, too. Separate issue.

[Wojciech Inglot (winglot)]

I have received an email from Rico Tzschichholz: "Review: Disapprove". Is it possible to know what is wrong with this code so I could fix it?

[Cody Garver (codygarver)]

His disapprove was probably because you proposed merging lp:gala into this branch. Instead you should have proposed merging this branch into lp:gala.

The merge proposal I'm commenting on right now is the correct one.

You don't have to take any further action.

[Tom Beckmann (tombeckmann)]

Great work, Thanks for the fix!

review: Approve

=== modified file 'src/Widgets/WindowSwitcher.vala'
--- src/Widgets/WindowSwitcher.vala	2013-08-04 22:35:22 +0000
+++ src/Widgets/WindowSwitcher.vala	2013-08-18 23:20:11 +0000
@@ -155,7 +155,8 @@
 				
 				//reset order
 				clone.get_parent ().set_child_below_sibling (clone, null);
-				clone.animate (AnimationMode.EASE_OUT_CUBIC, 150, depth : 0.0f, opacity : 255);
+				if (!(clone.source as Meta.WindowActor).get_meta_window ().minimized)
+					clone.animate (AnimationMode.EASE_OUT_CUBIC, 150, depth : 0.0f, opacity : 255);
 			}
 			
 			if (current_window != null) {
@@ -184,7 +185,7 @@
 				if (window_actors == null)
 					return;
 				foreach (var window in window_actors) {
-					if (window.get_workspace () == workspace.index ())
+					if (window.get_workspace () == workspace.index () && !window.get_meta_window ().minimized)
 						window.show ();
 				}