Merge lp:~tintou/gala/deprecation-removal into lp:gala

[Corentin Noël]

Changed a lot of functions to post clutter 1.2 way of doing them.

[Rico Tzschichholz (ricotz)]

Rebased and moved it to https://code.launchpad.net/~gala-dev/gala/clutter-deprecations/+merge/277315

Unmerged revisions

488. By Corentin Noël on 2015-10-23

Removed a lot of deprecation warnings.

487. By Corentin Noël on 2015-10-23

[WindowSwitcher] Replaced deprecated Gravity.

486. By Corentin Noël on 2015-10-23

Fixed wrong DBus annotation.

=== modified file 'src/DBus.vala'
--- src/DBus.vala	2015-03-04 10:50:18 +0000
+++ src/DBus.vala	2015-10-23 21:59:47 +0000
@@ -23,7 +23,7 @@
 		static DBus? instance;
 		static WindowManager wm;
 
-		[DBus (visibile = false)]
+		[DBus (visible = false)]
 		public static void init (WindowManager _wm)
 		{
 			wm = _wm;

=== modified file 'src/Widgets/WindowClone.vala'
--- src/Widgets/WindowClone.vala	2015-04-11 15:24:55 +0000
+++ src/Widgets/WindowClone.vala	2015-10-23 21:59:47 +0000
@@ -447,6 +447,9 @@
 
 		void toggle_shadow (bool show)
 		{
+			if (get_transition ("shadow-opacity") != null)
+				remove_transition ("shadow-opacity");
+
 			var shadow_transition = new PropertyTransition ("shadow-opacity");
 			shadow_transition.duration = MultitaskingView.ANIMATION_DURATION;
 			shadow_transition.remove_on_complete = true;

=== modified file 'src/Widgets/WindowSwitcher.vala'
--- src/Widgets/WindowSwitcher.vala	2015-06-27 21:04:28 +0000
+++ src/Widgets/WindowSwitcher.vala	2015-10-23 21:59:47 +0000
@@ -148,8 +148,6 @@
 
 			var height = icon_size + (top_offset > 0 ? top_offset : 0) + bottom_offset;
 
-			dock.anchor_gravity = horizontal ? Gravity.NORTH : Gravity.WEST;
-
 			if (horizontal) {
 				dock.height = height;
 				dock.x = Math.ceilf (geometry.x + geometry.width / 2.0f);
@@ -246,10 +244,12 @@
 
 			if (dock_settings.is_horizontal_dock ()) {
 				dock.width = dock_width;
+				dock.translation_x = Math.ceilf (-dock_width / 2.0f);
 				dock.get_first_child ().margin_left = items_offset;
 				dock.get_last_child ().margin_right = items_offset;
 			} else {
 				dock.height = dock_width;
+				dock.translation_y = Math.ceilf (-dock_width / 2.0f);
 				dock.get_first_child ().margin_top = items_offset;
 				dock.get_last_child ().margin_bottom = items_offset;
 			}
@@ -267,9 +267,11 @@
 			if (dock_settings.is_horizontal_dock ()) {
 				dock.layout_manager.get_preferred_width (dock, dock.height, null, out dest_width);
 				dock.width = dest_width;
+				dock.translation_x = Math.ceilf (-dest_width / 2.0f);
 			} else {
 				dock.layout_manager.get_preferred_height (dock, dock.width, null, out dest_width);
 				dock.height = dest_width;
+				dock.translation_y = Math.ceilf (-dest_width / 2.0f);
 			}
 
 			dock.restore_easing_state ();
@@ -476,10 +478,13 @@
 			dock.set_easing_duration (250);
 			dock.set_easing_mode (AnimationMode.EASE_OUT_CUBIC);
 
-			if (dock_settings.is_horizontal_dock ())
+			if (dock_settings.is_horizontal_dock ()) {
 				dock.width = dest_width;
-			else
+				dock.translation_x = Math.ceilf (-dest_width / 2.0f);
+			} else {
 				dock.height = dest_width;
+				dock.translation_y = Math.ceilf (-dest_width / 2.0f);
+			}
 
 			dock.opacity = 0;
 			dock.restore_easing_state ();

=== modified file 'src/Widgets/WorkspaceInsertThumb.vala'
--- src/Widgets/WorkspaceInsertThumb.vala	2015-03-04 08:36:08 +0000
+++ src/Widgets/WorkspaceInsertThumb.vala	2015-10-23 21:59:47 +0000
@@ -39,8 +39,7 @@
 			opacity = 0;
 			set_pivot_point (0.5f, 0.5f);
 			reactive = true;
-
-			layout_manager = new BinLayout (BinAlignment.CENTER);
+			x_align = Clutter.ActorAlign.CENTER;
 
 			var drop = new DragDropAction (DragDropActionType.DESTINATION, "multitaskingview-window");
 			drop.crossed.connect ((hovered) => {

=== modified file 'src/WindowManager.vala'
--- src/WindowManager.vala	2015-09-10 11:32:41 +0000
+++ src/WindowManager.vala	2015-10-23 21:59:47 +0000
@@ -767,34 +767,45 @@
 				float scale_y  = (float)icon.height / actor.height;
 				float anchor_x = (float)(actor.x - icon.x) * actor.width  / (icon.width  - actor.width);
 				float anchor_y = (float)(actor.y - icon.y) * actor.height / (icon.height - actor.height);
-
-				// FIXME set_pivot_point appears to show weird behavior for negative values, which we will need
-				//       in some cases. scale_center_{x,y} works fine so far.
-				actor.scale_center_x = anchor_x;
-				actor.scale_center_y = anchor_y;
-
-				actor.animate (Clutter.AnimationMode.EASE_IN_EXPO, duration,
-					scale_x:scale_x, scale_y:scale_y,opacity:0).completed.connect (() => {
-
-					actor.scale_center_x = actor.scale_center_y = 0;
-					actor.opacity = 255;
-					actor.scale_x = 1.0;
-					actor.scale_y = 1.0;
+				actor.set_pivot_point (anchor_x, anchor_y);
+
+				actor.save_easing_state ();
+				actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_EXPO);
+				actor.set_easing_duration (duration);
+				actor.scale_x = scale_x;
+				actor.scale_y = scale_y;
+				actor.opacity = 0U;
+				actor.restore_easing_state ();
+
+				ulong minimize_handler_id = 0UL;
+				minimize_handler_id = actor.transitions_completed.connect (() => {
+					actor.disconnect (minimize_handler_id);
+					actor.set_pivot_point (0.0f, 0.0f);
+					actor.opacity = 255U;
+					actor.scale_x = 1.0f;
+					actor.scale_y = 1.0f;
 					minimize_completed (actor);
 					minimizing.remove (actor);
 				});
 
 			} else {
-				actor.scale_center_x = width / 2.0f - actor.x;
-				actor.scale_center_y = height - actor.y;
-
-				actor.animate (Clutter.AnimationMode.EASE_IN_EXPO, duration,
-					scale_x : 0.0f, scale_y : 0.0f, opacity : 0).completed.connect (() => {
-
-					actor.set_pivot_point (0, 0);
-					actor.opacity = 255;
-					actor.scale_x = 1.0;
-					actor.scale_y = 1.0;
+				actor.set_pivot_point (width / 2.0f - actor.x, height - actor.y);
+
+				actor.save_easing_state ();
+				actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_EXPO);
+				actor.set_easing_duration (duration);
+				actor.scale_x = 0.0f;
+				actor.scale_y = 0.0f;
+				actor.opacity = 0U;
+				actor.restore_easing_state ();
+
+				ulong minimize_handler_id = 0UL;
+				minimize_handler_id = actor.transitions_completed.connect (() => {
+					actor.disconnect (minimize_handler_id);
+					actor.set_pivot_point (0.0f, 0.0f);
+					actor.opacity = 255U;
+					actor.scale_x = 1.0f;
+					actor.scale_y = 1.0f;
 					minimize_completed (actor);
 					minimizing.remove (actor);
 				});
@@ -877,7 +888,7 @@
 
 				maximize_completed (actor);
 
-				actor.scale_gravity = Clutter.Gravity.NORTH_WEST;
+				actor.set_pivot_point (0.0f, 0.0f);
 				actor.translation_x = old_inner_rect.x - ex;
 				actor.translation_y = old_inner_rect.y - ey;
 				actor.scale_x = 1.0 / scale_x;
@@ -925,14 +936,22 @@
 
 					unminimizing.add (actor);
 
-					actor.scale_gravity = Clutter.Gravity.SOUTH;
+					actor.set_pivot_point (0.5f, 1.0f);
 					actor.scale_x = 0.01f;
 					actor.scale_y = 0.1f;
-					actor.opacity = 0;
-					actor.animate (Clutter.AnimationMode.EASE_OUT_EXPO, duration,
-						scale_x:1.0f, scale_y:1.0f, opacity:255)
-						.completed.connect ( () => {
-
+					actor.opacity = 0U;
+
+					actor.save_easing_state ();
+					actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_EXPO);
+					actor.set_easing_duration (duration);
+					actor.scale_x = 1.0f;
+					actor.scale_y = 1.0f;
+					actor.opacity = 255U;
+					actor.restore_easing_state ();
+
+					ulong unminimize_handler_id = 0UL;
+					unminimize_handler_id = actor.transitions_completed.connect (() => {
+						actor.disconnect (unminimize_handler_id);
 						unminimizing.remove (actor);
 						unminimize_completed (actor);
 					});
@@ -970,14 +989,22 @@
 
 					mapping.add (actor);
 
-					actor.scale_gravity = Clutter.Gravity.SOUTH;
+					actor.set_pivot_point (0.5f, 1.0f);
 					actor.scale_x = 0.01f;
 					actor.scale_y = 0.1f;
 					actor.opacity = 0;
-					actor.animate (Clutter.AnimationMode.EASE_OUT_EXPO, duration,
-						scale_x:1.0f, scale_y:1.0f, opacity:255)
-						.completed.connect ( () => {
-
+
+					actor.save_easing_state ();
+					actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_EXPO);
+					actor.set_easing_duration (duration);
+					actor.scale_x = 1.0f;
+					actor.scale_y = 1.0f;
+					actor.opacity = 255U;
+					actor.restore_easing_state ();
+
+					ulong map_handler_id = 0UL;
+					map_handler_id = actor.transitions_completed.connect (() => {
+						actor.disconnect (map_handler_id);
 						mapping.remove (actor);
 						map_completed (actor);
 					});
@@ -993,15 +1020,23 @@
 
 					mapping.add (actor);
 
-					actor.scale_gravity = Clutter.Gravity.CENTER;
-					actor.rotation_center_x = {0, 0, 10};
+					actor.set_pivot_point (0.5f, 0.5f);
+					actor.set_pivot_point_z (0.2f);
 					actor.scale_x = 0.9f;
 					actor.scale_y = 0.9f;
 					actor.opacity = 0;
-					actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, duration,
-						scale_x:1.0f, scale_y:1.0f, opacity:255)
-						.completed.connect ( () => {
-
+
+					actor.save_easing_state ();
+					actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
+					actor.set_easing_duration (duration);
+					actor.scale_x = 1.0f;
+					actor.scale_y = 1.0f;
+					actor.opacity = 255U;
+					actor.restore_easing_state ();
+
+					ulong map_handler_id = 0UL;
+					map_handler_id = actor.transitions_completed.connect (() => {
+						actor.disconnect (map_handler_id);
 						mapping.remove (actor);
 						map_completed (actor);
 					});
@@ -1011,13 +1046,21 @@
 
 					mapping.add (actor);
 
-					actor.scale_gravity = Clutter.Gravity.NORTH;
+					actor.set_pivot_point (0.5f, 0.0f);
 					actor.scale_y = 0.0f;
 					actor.opacity = 0;
 
-					actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250,
-						scale_y:1.0f, opacity:255).completed.connect ( () => {
+					actor.save_easing_state ();
+					actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
+					actor.set_easing_duration (250);
+					actor.scale_x = 1.0f;
+					actor.scale_y = 1.0f;
+					actor.opacity = 255U;
+					actor.restore_easing_state ();
 
+					ulong map_handler_id = 0UL;
+					map_handler_id = actor.transitions_completed.connect (() => {
+						actor.disconnect (map_handler_id);
 						mapping.remove (actor);
 						map_completed (actor);
 					});
@@ -1061,12 +1104,20 @@
 
 					destroying.add (actor);
 
-					actor.scale_gravity = Clutter.Gravity.CENTER;
+					actor.set_pivot_point (0.5f, 0.5f);
 					actor.show ();
-					actor.animate (Clutter.AnimationMode.LINEAR, duration,
-						scale_x:0.8f, scale_y:0.8f, opacity:0)
-						.completed.connect ( () => {
-
+
+					actor.save_easing_state ();
+					actor.set_easing_mode (Clutter.AnimationMode.LINEAR);
+					actor.set_easing_duration (duration);
+					actor.scale_x = 0.8f;
+					actor.scale_y = 0.8f;
+					actor.opacity = 0U;
+					actor.restore_easing_state ();
+
+					ulong destroy_handler_id = 0UL;
+					destroy_handler_id = actor.transitions_completed.connect (() => {
+						actor.disconnect (destroy_handler_id);
 						destroying.remove (actor);
 						destroy_completed (actor);
 						Utils.request_clean_icon_cache (get_all_xids ());
@@ -1076,10 +1127,17 @@
 				case WindowType.DIALOG:
 					destroying.add (actor);
 
-					actor.scale_gravity = Clutter.Gravity.NORTH;
-					actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200,
-						scale_y:0.0f, opacity:0).completed.connect ( () => {
+					actor.set_pivot_point (0.5f, 0.0f);
+					actor.save_easing_state ();
+					actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
+					actor.set_easing_duration (200);
+					actor.scale_y = 0.0f;
+					actor.opacity = 0U;
+					actor.restore_easing_state ();
 
+					ulong destroy_handler_id = 0UL;
+					destroy_handler_id = actor.transitions_completed.connect (() => {
+						actor.disconnect (destroy_handler_id);
 						destroying.remove (actor);
 						destroy_completed (actor);
 					});
@@ -1097,11 +1155,17 @@
 					}
 
 					destroying.add (actor);
-
-					actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, duration,
-						scale_x:0.8f, scale_y:0.8f, opacity:0)
-						.completed.connect ( () => {
-
+					actor.save_easing_state ();
+					actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
+					actor.set_easing_duration (duration);
+					actor.scale_x = 0.8f;
+					actor.scale_y = 0.8f;
+					actor.opacity = 0U;
+					actor.restore_easing_state ();
+
+					ulong destroy_handler_id = 0UL;
+					destroy_handler_id = actor.transitions_completed.connect (() => {
+						actor.disconnect (destroy_handler_id);
 						destroying.remove (actor);
 						destroy_completed (actor);
 					});
@@ -1154,34 +1218,44 @@
 
 				ui_group.add_child (old_actor);
 
-				var scale_x = (double) (ew - offset_width) / old_rect.width;
-				var scale_y = (double) (eh - offset_height) / old_rect.height;
-
-				old_actor.animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, duration,
-						x: (ex - offset_x),
-						y: (ey - offset_y),
-						opacity: 0,
-						scale_x: scale_x,
-						scale_y: scale_y).completed.connect (() => {
+				var scale_x = (float) (ew - offset_width) / old_rect.width;
+				var scale_y = (float) (eh - offset_height) / old_rect.height;
+
+				old_actor.save_easing_state ();
+				old_actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+				old_actor.set_easing_duration (duration);
+				old_actor.x = ex - offset_x;
+				old_actor.y = ey - offset_y;
+				old_actor.scale_x = scale_x;
+				old_actor.scale_y = scale_y;
+				old_actor.opacity = 0U;
+				old_actor.restore_easing_state ();
+
+				ulong unmaximize_old_handler_id = 0UL;
+				unmaximize_old_handler_id = old_actor.transitions_completed.connect (() => {
+					old_actor.disconnect (unmaximize_old_handler_id);
 					old_actor.destroy ();
 				});
 
 				var maximized_x = actor.x;
 				var maximized_y = actor.y;
 				unmaximize_completed (actor);
-				actor.scale_gravity = Clutter.Gravity.NORTH_WEST;
+				actor.set_pivot_point (0.0f, 0.0f);
 				actor.x = ex;
 				actor.y = ey;
-				actor.translation_x = -ex + offset_x * (float) (1.0 / scale_x) + maximized_x;
-				actor.translation_y = -ey + offset_y * (float) (1.0 / scale_y) + maximized_y;
-				actor.scale_x = 1.0 / scale_x;
-				actor.scale_y = 1.0 / scale_y;
+				actor.translation_x = -ex + offset_x * (1.0f / scale_x) + maximized_x;
+				actor.translation_y = -ey + offset_y * (1.0f / scale_y) + maximized_y;
+				actor.scale_x = 1.0f / scale_x;
+				actor.scale_y = 1.0f / scale_y;
 
-				actor.animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, duration,
-						scale_x: 1.0,
-						scale_y: 1.0,
-						translation_x: 0.0,
-						translation_y: 0.0);
+				actor.save_easing_state ();
+				actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+				actor.set_easing_duration (duration);
+				actor.scale_x = 1.0f;
+				actor.scale_y = 1.0f;
+				actor.translation_x = 0.0f;
+				actor.translation_y = 0.0f;
+				actor.restore_easing_state ();
 
 				return;
 			}
@@ -1202,12 +1276,11 @@
 			}
 
 			actor.detach_animation ();
-			actor.opacity = 255;
+			actor.opacity = 255U;
 			actor.scale_x = 1.0f;
 			actor.scale_y = 1.0f;
 			actor.rotation_angle_x = 0.0f;
-			actor.anchor_gravity = Clutter.Gravity.NORTH_WEST;
-			actor.scale_gravity = Clutter.Gravity.NORTH_WEST;
+			actor.set_pivot_point (0.0f, 0.0f);
 
 			list.remove (actor);
 			return true;
@@ -1261,8 +1334,8 @@
 			var primary = screen.get_primary_monitor ();
 			var move_primary_only = InternalUtils.workspaces_only_on_primary ();
 			var monitor_geom = screen.get_monitor_geometry (primary);
-			var clone_offset_x = move_primary_only ? monitor_geom.x : 0;
-			var clone_offset_y = move_primary_only ? monitor_geom.y : 0;
+			var clone_offset_x = move_primary_only ? monitor_geom.x : 0.0f;
+			var clone_offset_y = move_primary_only ? monitor_geom.y : 0.0f;
 
 			screen.get_size (out screen_width, out screen_height);
 
@@ -1391,15 +1464,15 @@
 				if (!from_has_fullscreened) {
 					windows.prepend (window);
 					parents.prepend (window.get_parent ());
-					window.set_translation (-clone_offset_x, -clone_offset_y, 0);
+					window.set_translation (-clone_offset_x, -clone_offset_y, 0.0f);
 
 					clutter_actor_reparent (window, out_group);
 				}
 			}
 
 			main_container.clip_to_allocation = true;
-			main_container.x = move_primary_only ? monitor_geom.x : 0;
-			main_container.y = move_primary_only ? monitor_geom.y : 0;
+			main_container.x = move_primary_only ? monitor_geom.x : 0.0f;
+			main_container.y = move_primary_only ? monitor_geom.y : 0.0f;
 			main_container.width = move_primary_only ? monitor_geom.width : screen_width;
 			main_container.height = move_primary_only ? monitor_geom.height : screen_height;
 
@@ -1407,8 +1480,8 @@
 			if (direction == MotionDirection.RIGHT)
 				x2 = -x2;
 
-			out_group.x = 0;
-			wallpaper.x = 0;
+			out_group.x = 0.0f;
+			wallpaper.x = 0.0f;
 			in_group.x = -x2;
 			wallpaper_clone.x = -x2;
 
@@ -1430,10 +1503,10 @@
 			wallpaper.set_easing_duration (animation_duration);
 
 			out_group.x = x2;
-			in_group.x = 0;
+			in_group.x = 0.0f;
 
 			wallpaper.x = x2;
-			wallpaper_clone.x = 0;
+			wallpaper_clone.x = 0.0f;
 			wallpaper.restore_easing_state ();
 
 			var transition = in_group.get_transition ("x");
@@ -1453,7 +1526,7 @@
 
 			for (var i = 0; i < windows.length (); i++) {
 				var actor = windows.nth_data (i);
-				actor.set_translation (0, 0, 0);
+				actor.set_translation (0.0f, 0.0f, 0.0f);
 
 				// to maintain the correct order of monitor, we need to insert the Background
 				// back manually
@@ -1498,10 +1571,10 @@
 					window.hide ();
 
 				// some static windows may have been faded out
-				if (actor.opacity < 255) {
+				if (actor.opacity < 255U) {
 					actor.save_easing_state ();
 					actor.set_easing_duration (300);
-					actor.opacity = 255;
+					actor.opacity = 255U;
 					actor.restore_easing_state ();
 				}
 			}