Merge lp:~gala-dev/gala/no-animate-depth into lp:gala

[Tom Beckmann]

Adds an animate-depth key defaulting to false, which toggles the depth part of menu and alt-tab animations.

[Sergey "Shnatsel" Davidoff (shnatsel)]

This is better, but Slingshot still appears with a visual BOOM!

Also, I'm not sure why a GSettings key for this should be introduced. First, the name of the key is confusing, since it affects only some of the animations. Seconf, if these animations have superior usability, we should probably hardcode them - as per http://elementaryos.org/docs/avoid-configuration

review: Needs Fixing

[Sergey "Shnatsel" Davidoff (shnatsel)]

Also, this change does not affect the Slingshot closing animation.

Menu animations should probably be made faster, right now they're taking too long.

review: Needs Fixing

[lp:~gala-dev/gala/no-animate-depth]

297. By Tom Beckmann on 2013-02-10

Add menu destroy animation

[Cody Garver (codygarver)]

Really like this.

[Cody Garver (codygarver)]

On paper it sounds like a bad idea, but in execution it gives this feel of maturity to the desktop we haven't seen since gala itself was introduced. Not to mention it reduces visual glitches at Slingshot launch and most importantly it reduces visual lag when the system is under stress.

[Danielle Foré (danrabbit)]

Hrm. I don't really like it as much to be honest :/

[Danielle Foré (danrabbit)]

Tom and I talked about it and decided we were -1 to this particularly change. But we're open to discussing other ways to make the animations smoother.

review: Disapprove

[Sergey "Shnatsel" Davidoff (shnatsel)]

The Lord has spoken. Amen.

Unmerged revisions

297. By Tom Beckmann on 2013-02-10

Add menu destroy animation

296. By Tom Beckmann on 2013-02-10

gsettings: add animate-depth key which toggles the depth part of the menu and window switcher animations, default is false

=== modified file 'data/org.pantheon.desktop.gala.gschema.xml'
--- data/org.pantheon.desktop.gala.gschema.xml	2013-02-10 14:01:15 +0000
+++ data/org.pantheon.desktop.gala.gschema.xml	2013-02-10 17:48:21 +0000
@@ -128,6 +128,11 @@
 	</schema>
 	
 	<schema path="/org/pantheon/desktop/gala/animations/" id="org.pantheon.desktop.gala.animations" gettext-domain="gala">
+		<key type="b" name="animate-depth">
+			<default>false</default>
+			<summary>Enable depth in animations</summary>
+			<description>If this is set to true, the alt-tab-switcher and menu animation will animate with depth</description>
+		</key>
 		<key type="b" name="enable-animations">
 			<default>true</default>
 			<summary>Enable Animations</summary>
 
=== modified file 'src/Plugin.vala'
--- src/Plugin.vala	2013-02-10 13:37:14 +0000
+++ src/Plugin.vala	2013-02-10 17:48:21 +0000
@@ -464,8 +464,10 @@
 					
 					actor.scale_gravity = Clutter.Gravity.CENTER;
 					actor.rotation_center_x = {0, 0, 10};
-					actor.scale_x = 0.9f;
-					actor.scale_y = 0.9f;
+					if (AnimationSettings.get_default ().animate_depth) {
+						actor.scale_x = 0.9f;
+						actor.scale_y = 0.9f;
+					}
 					actor.opacity = 0;
 					actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, AnimationSettings.get_default ().menu_duration, 
 						scale_x:1.0f, scale_y:1.0f, opacity:255)
@@ -558,10 +560,15 @@
 					
 					destroying.add (actor);
 					
-					actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, AnimationSettings.get_default ().menu_duration, 
-						scale_x:0.8f, scale_y:0.8f, opacity:0)
-						.completed.connect ( () => {
-						
+					Clutter.Animation anim;
+					if (AnimationSettings.get_default ().animate_depth)
+						anim = actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, AnimationSettings.get_default ().menu_duration, 
+							scale_x:0.8f, scale_y:0.8f, opacity:0);
+					else
+						anim = actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, AnimationSettings.get_default ().menu_duration, 
+							opacity : 0);
+
+					anim.completed.connect ( () => {
 						destroying.remove (actor);
 						destroy_completed (actor);
 					});
 
=== modified file 'src/Settings.vala'
--- src/Settings.vala	2013-02-10 14:01:15 +0000
+++ src/Settings.vala	2013-02-10 17:48:21 +0000
@@ -129,6 +129,7 @@
 	public class AnimationSettings : Granite.Services.Settings
 	{
 		public bool enable_animations { get; set; }
+		public bool animate_depth { get; set; }
 		public int open_duration { get; set; }
 		public int snap_duration { get; set; }
 		public int close_duration { get; set; }
 
=== modified file 'src/Widgets/WindowSwitcher.vala'
--- src/Widgets/WindowSwitcher.vala	2013-02-10 14:01:15 +0000
+++ src/Widgets/WindowSwitcher.vala	2013-02-10 17:48:21 +0000
@@ -232,7 +232,10 @@
 					
 					dock.get_child_at_index (i).animate (AnimationMode.LINEAR, 100, opacity : 255);
 				} else {
-					clone.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, depth : -200.0f, opacity : 0);
+					if (AnimationSettings.get_default ().animate_depth)
+						clone.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, depth : -200.0f, opacity : 0);
+					else
+						clone.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, opacity : 0);
 					dock.get_child_at_index (i).animate (AnimationMode.LINEAR, 100, opacity : 100);
 				}