Merge lp:~diego-rocha-comp/gala/fix-overview-foreign-windows into lp:gala

[Diego Rocha]

When in overview mode, always stack windows from a workspace that is not the current below. Also, fade them out when leaving this mode.

[lp:~diego-rocha-comp/gala/fix-overview-foreign-windows]

509. By Diego Rocha on 2016-02-20

windowclone: stack windows foreign windows below and fade them out

[Zisu Andrei (matzipan)]

Hey, I built and ran this but it's unclear what I should be seeing. Can you point it out for me?

review: Needs Information

[Zisu Andrei (matzipan)]

Rejecting since not clear what this branch is.

review: Disapprove

Unmerged revisions

509. By Diego Rocha on 2016-02-20

windowclone: stack windows foreign windows below and fade them out

=== modified file 'src/Widgets/WindowClone.vala'
--- src/Widgets/WindowClone.vala	2016-02-15 15:40:55 +0000
+++ src/Widgets/WindowClone.vala	2016-02-20 03:01:18 +0000
@@ -279,6 +279,10 @@
 
 			set_position (outer_rect.x - offset_x, outer_rect.y - offset_y);
 			set_size (outer_rect.width, outer_rect.height);
+			
+			if (should_fade ())
+				opacity = 0;
+			
 			restore_easing_state ();
 
 			if (animate)
@@ -286,9 +290,6 @@
 
 			window_icon.opacity = 0;
 			close_button.opacity = 0;
-
-			if (should_fade ())
-				opacity = 0;
 		}
 
 		/**

=== modified file 'src/Widgets/WindowCloneContainer.vala'
--- src/Widgets/WindowCloneContainer.vala	2015-11-11 19:56:40 +0000
+++ src/Widgets/WindowCloneContainer.vala	2016-02-20 03:01:18 +0000
@@ -60,7 +60,6 @@
 		 */
 		public void add_window (Window window)
 		{
-			unowned Meta.Display display = window.get_display ();
 			var children = get_children ();
 			
 			GLib.SList<unowned Meta.Window> windows = new GLib.SList<unowned Meta.Window> ();
@@ -71,36 +70,29 @@
 			windows.prepend (window);
 			windows.reverse ();
 			
-			var windows_ordered = display.sort_windows_by_stacking (windows);
-			
 			var new_window = new WindowClone (window, overview_mode);
 
 			new_window.selected.connect (window_selected_cb);
 			new_window.destroy.connect (window_destroyed);
 			new_window.request_reposition.connect (reflow);
 
-			var added = false;
-			unowned Meta.Window? target = null;
-			foreach (unowned Meta.Window w in windows_ordered) {
-				if (w != window) {
-					target = w;
-					continue;
-				}
-				break;
-			}
-
-			foreach (unowned Actor child in children) {
-				unowned WindowClone tw = (WindowClone) child;
-				if (target == tw.window) {
-					insert_child_above (new_window, tw);
-					added = true;
-					break;
-				}
-			}
-
-			// top most or no other children
-			if (!added)
-				add_child (new_window);
+			if (window.get_workspace () == window.get_screen ().get_active_workspace ()) {
+				var added = false;
+				foreach (unowned Actor child in children) {
+					unowned WindowClone tw = (WindowClone) child;
+					if (window == tw.window) {
+						insert_child_above (new_window, tw);
+						added = true;
+						break;
+					}
+				}
+
+				// top most or no other children
+				if (!added)
+					add_child (new_window);
+			} else {
+				insert_child_at_index (new_window, 0);
+			}
 
 			reflow ();
 		}