Merge lp:~diego-rocha-comp/gala/multitasking-view-fixes into lp:gala

[Diego Rocha]

Fixed some overview/multitasking view bugs.

- Fixed window shadow that didn't resize and fade properly with its window clone
- Fixed window icons being shown and hidden harshly
- Fixed window close button being hidden harshly when leaving multitasking view
- Fixed animation of window clone and icon when dragging window from a neighboor workspace
- Fixed window shadow being faded in every time a window is dragged

[Rico Tzschichholz (ricotz)]

Please drop all no-change/whitespace changes.
Don't add superfluous empty lines at top of methods.
Use gobject-style construction.

Please try to split your changes into logical commits addressing the issues you are fixing.

review: Needs Fixing

[Diego Rocha (diego-rocha-comp)]

Rico, I made all those changes and resubmitted :)

Unmerged revisions

504. By Diego Rocha on 2016-02-13

Fixed some overview/multitasking view bugs.

- Fixed window shadow that didn't resize and fade properly with its window clone
- Fixed window icons being shown and hidden harshly
- Fixed window close button being hidden harshly when leaving multitasking view
- Fixed animation of window clone and icon when dragging window from a neighboor workspace
- Fixed window shadow being faded in every time a window is dragged

=== modified file 'src/ShadowEffect.vala'
--- src/ShadowEffect.vala	2014-07-18 05:37:33 +0000
+++ src/ShadowEffect.vala	2016-02-13 05:55:01 +0000
@@ -122,21 +122,31 @@
 				shadow_cache.unset (key);
 		}
 
+		public virtual ActorBox get_bounding_box ()
+		{
+			var size = shadow_size * scale_factor;
+			var bounding_box = ActorBox ();
+
+			bounding_box.set_origin (-size, -size);
+			bounding_box.set_size (actor.width + size * 2, actor.height + size * 2);
+
+			return bounding_box;
+		}
+
 		public override void paint (EffectPaintFlags flags)
 		{
-			var size = shadow_size * scale_factor;
-
 			var opacity = actor.get_paint_opacity () * shadow_opacity / 255;
 			var alpha = Cogl.Color.from_4ub (255, 255, 255, opacity);
 			alpha.premultiply ();
 
 			material.set_color (alpha);
 
+			var bounding_box = get_bounding_box ();
+
 			Cogl.set_source (material);
-			Cogl.rectangle (-size, -size, actor.width + size, actor.height + size);
+			Cogl.rectangle (bounding_box.x1, bounding_box.y1, bounding_box.x2, bounding_box.y2);
 
 			actor.continue_paint ();
 		}
 	}
 }
-

=== modified file 'src/Widgets/WindowClone.vala'
--- src/Widgets/WindowClone.vala	2015-11-12 08:33:24 +0000
+++ src/Widgets/WindowClone.vala	2016-02-13 05:55:01 +0000
@@ -20,6 +20,37 @@
 
 namespace Gala
 {
+
+	private class WindowCloneShadowEffect : ShadowEffect
+	{
+		public WindowActor window_actor { get; set; }
+
+		public WindowCloneShadowEffect (WindowActor window_actor, int shadow_size, int shadow_spread)
+		{
+			base((int)window_actor.width, (int)window_actor.height, shadow_size, shadow_spread);
+
+			this.window_actor = window_actor;
+		}
+
+		public override ActorBox get_bounding_box ()
+		{
+
+			var size = shadow_size * scale_factor;
+
+			var window = window_actor.get_meta_window();
+			var input_rect = window.get_buffer_rect ();
+			var outer_rect = window.get_frame_rect ();
+
+			// Occupy only window frame area plus shadow size
+			var bounding_box = ActorBox ();
+			bounding_box.set_origin (-(input_rect.x - outer_rect.x) - size, -(input_rect.y - outer_rect.y) - size);
+			bounding_box.set_size (outer_rect.width + size * 2, outer_rect.height + size * 2);
+
+			return bounding_box;
+		}
+
+	}
+
 	/**
 	 * A container for a clone of the texture of a MetaWindow, a WindowIcon,
 	 * a close button and a shadow. Used together with the WindowCloneContainer.
@@ -88,7 +119,7 @@
 
 		DragDropAction? drag_action = null;
 		Clone? clone = null;
-		ShadowEffect? shadow_effect = null;
+		WindowCloneShadowEffect? shadow_effect = null;
 
 		Actor prev_parent = null;
 		int prev_index = -1;
@@ -139,7 +170,8 @@
 
 			window_icon = new WindowIcon (window, WINDOW_ICON_SIZE);
 			window_icon.opacity = 0;
-			window_icon.set_pivot_point (0.5f, 0.5f);
+			window_icon.set_scale (0, 0);
+			window_icon.set_pivot_point (0.5f, 0.75f);
 
 			active_shape = new Clutter.Actor ();
 			active_shape.background_color = { 255, 255, 255, 200 };
@@ -165,12 +197,12 @@
 
 		/**
 		 * Waits for the texture of a new WindowActor to be available
-		 * and makes a close of it. If it was already was assigned a slot
+		 * and makes a clone of it. If it was already was assigned a slot
 		 * at this point it will animate to it. Otherwise it will just place
 		 * itself at the location of the original window. Also adds the shadow
 		 * effect and makes sure the shadow is updated on size changes.
 		 *
-		 * @param was_waiting Internal argument used to indicate that we had to 
+		 * @param was_waiting Internal argument used to indicate that we had to
 		 *                    wait before the window's texture became available.
 		 */
 		void load_clone (bool was_waiting = false)
@@ -198,9 +230,10 @@
 
 			transition_to_original_state (false);
 
-			var outer_rect = window.get_frame_rect ();
-			shadow_effect = new ShadowEffect (outer_rect.width, outer_rect.height, 40, 5);
-			add_effect_with_name ("shadow", shadow_effect);
+			shadow_effect = new WindowCloneShadowEffect (actor, 40, 5);
+			shadow_effect.shadow_opacity = 0;
+			clone.add_effect_with_name ("shadow", shadow_effect);
+			
 			window.size_changed.connect (update_shadow_size);
 
 			if (should_fade ())
@@ -241,8 +274,8 @@
 
 			shadow_update_timeout = Timeout.add (500, () => {
 				var rect = window.get_frame_rect ();
-				var effect = get_effect ("shadow") as ShadowEffect;
-				effect.update_size (rect.width, rect.height);
+
+				shadow_effect.update_size (rect.width, rect.height);
 
 				shadow_update_timeout = 0;
 
@@ -284,7 +317,14 @@
 			if (animate)
 				toggle_shadow (false);
 
+			window_icon.save_easing_state ();
+			window_icon.set_easing_duration (MultitaskingView.ANIMATION_DURATION);
+			window_icon.set_easing_mode (MultitaskingView.ANIMATION_MODE);
 			window_icon.opacity = 0;
+			window_icon.set_scale (0, 0);
+			window_icon.restore_easing_state ();
+
+			close_button.opacity = 0;
 
 			if (should_fade ())
 				opacity = 0;
@@ -303,9 +343,14 @@
 
 			set_size (rect.width, rect.height);
 			set_position (rect.x, rect.y);
+			restore_easing_state ();
 
+			window_icon.save_easing_state ();
+			window_icon.set_easing_duration (MultitaskingView.ANIMATION_DURATION);
+			window_icon.set_easing_mode (MultitaskingView.ANIMATION_MODE);
 			window_icon.opacity = 255;
-			restore_easing_state ();
+			window_icon.set_scale (1, 1);
+			window_icon.restore_easing_state ();
 
 			toggle_shadow (true);
 
@@ -351,15 +396,16 @@
 			var outer_rect = window.get_frame_rect ();
 			var scale_factor = (float)width / outer_rect.width;
 
-			var shadow_effect = get_effect ("shadow") as ShadowEffect;
-			shadow_effect.scale_factor = scale_factor;
-
 			var alloc = ActorBox ();
-			alloc.set_origin ((input_rect.x - outer_rect.x) * scale_factor,
-			                  (input_rect.y - outer_rect.y) * scale_factor);
-			alloc.set_size (actor.width * scale_factor, actor.height * scale_factor);
-
-			clone.allocate (alloc, flags);
+			alloc.set_size (actor.width, actor.height);
+			alloc.set_origin((input_rect.x - outer_rect.x) * scale_factor, (input_rect.y - outer_rect.y) * scale_factor);
+
+			if (!dragging) {
+				clone.allocate (alloc, flags);
+				clone.set_scale (scale_factor, scale_factor);
+
+				place_widgets ((int)width, (int)height);
+			}
 		}
 
 		public override bool button_press_event (Clutter.ButtonEvent event)
@@ -367,14 +413,14 @@
 			return true;
 		}
 
-		public override	bool enter_event (Clutter.CrossingEvent event)
+		public override bool enter_event (Clutter.CrossingEvent event)
 		{
 			close_button.opacity = 255;
 
 			return false;
 		}
-		
-		public override	bool leave_event (Clutter.CrossingEvent event)
+
+		public override bool leave_event (Clutter.CrossingEvent event)
 		{
 			close_button.opacity = 0;
 
@@ -387,6 +433,7 @@
 		 */
 		public void place_widgets (int dest_width, int dest_height)
 		{
+
 			Granite.CloseButtonPosition pos;
 			Granite.Widgets.Utils.get_default_close_button_position (out pos);
 
@@ -426,9 +473,9 @@
 			shadow_transition.progress_mode = MultitaskingView.ANIMATION_MODE;
 
 			if (show)
-				shadow_transition.interval = new Clutter.Interval (typeof (uint8), 0, 255);
+				shadow_transition.interval = new Clutter.Interval (typeof (uint8), shadow_effect.shadow_opacity, 255);
 			else
-				shadow_transition.interval = new Clutter.Interval (typeof (uint8), 255, 0);
+				shadow_transition.interval = new Clutter.Interval (typeof (uint8), shadow_effect.shadow_opacity, 0);
 
 			add_transition ("shadow-opacity", shadow_transition);
 		}
@@ -505,25 +552,26 @@
 		Actor drag_begin (float click_x, float click_y)
 		{
 			float abs_x, abs_y;
+			float prev_parent_x, prev_parent_y;
 
 			prev_parent = get_parent ();
 			prev_index = prev_parent.get_children ().index (this);
 
+			prev_parent.get_transformed_position (out prev_parent_x, out prev_parent_y);
+
 			var stage = get_stage ();
 			prev_parent.remove_child (this);
 			stage.add_child (this);
 
 			var scale = window_icon.width / clone.width;
 
-			((ShadowEffect) get_effect ("shadow")).shadow_opacity = 0;
-
 			clone.get_transformed_position (out abs_x, out abs_y);
-			clone.set_pivot_point ((click_x - abs_x) / clone.width, (click_y - abs_y) / clone.height);
 			clone.save_easing_state ();
 			clone.set_easing_duration (200);
 			clone.set_easing_mode (AnimationMode.EASE_IN_CUBIC);
 			clone.set_scale (scale, scale);
 			clone.opacity = 0;
+			clone.set_pivot_point ((click_x - abs_x) / clone.width, (click_y - abs_y) / clone.height);
 			clone.restore_easing_state ();
 
 			request_reposition ();
@@ -532,12 +580,12 @@
 
 			save_easing_state ();
 			set_easing_duration (0);
-			set_position (abs_x, abs_y);
+			set_position (abs_x + prev_parent_x, abs_y + prev_parent_y);
 
 			window_icon.save_easing_state ();
 			window_icon.set_easing_duration (200);
 			window_icon.set_easing_mode (AnimationMode.EASE_IN_OUT_CUBIC);
-			window_icon.set_position (click_x - abs_x - window_icon.width / 2, click_y - abs_y - window_icon.height / 2);
+			window_icon.set_position (click_x - (abs_x + prev_parent_x) - window_icon.width / 2, click_y - (abs_y + prev_parent_y) - window_icon.height / 2);
 			window_icon.restore_easing_state ();
 
 			close_button.opacity = 0;
@@ -549,7 +597,7 @@
 
 		/**
 		 * When we cross an IconGroup, we animate to an even smaller size and slightly
-		 * less opacity and add ourselves as temporary window to the group. When left, 
+		 * less opacity and add ourselves as temporary window to the group. When left,
 		 * we reverse those steps.
 		 */
 		void drag_destination_crossed (Actor destination, bool hovered)
@@ -670,22 +718,14 @@
 			get_parent ().remove_child (this);
 			prev_parent.insert_child_at_index (this, prev_index);
 
+			clone.set_pivot_point (0, 0);
 			clone.save_easing_state ();
 			clone.set_easing_duration (250);
 			clone.set_easing_mode (AnimationMode.EASE_OUT_QUAD);
+
 			clone.set_scale (1, 1);
 			clone.opacity = 255;
 
-			Clutter.Callback finished = () => {
-				((ShadowEffect) get_effect ("shadow")).shadow_opacity = 255;
-			};
-
-			var transition = clone.get_transition ("scale-x");
-			if (transition != null)
-				transition.completed.connect (() => finished (this));
-			else
-				finished (this);
-
 			clone.restore_easing_state ();
 
 			request_reposition ();