Merge lp:~hikiko/compiz/compiz.expo-scale-options-skip-anim-steps into lp:compiz

[Eleni Maria Stea]

Added options for no animation in expo and scale plugins. They skip the intermediate fading steps that force several redraws.

Added options for no animation in expo and scale plugins. They skip the intermediate fading steps that force several redraws.

[Marco Trevisan (Treviño) (3v1n0)]

Thanks

review: Approve

=== modified file 'plugins/expo/expo.xml.in'
--- plugins/expo/expo.xml.in	2016-05-10 07:21:00 +0000
+++ plugins/expo/expo.xml.in	2016-06-30 05:21:32 +0000
@@ -95,7 +95,7 @@
 		    <_long>The animation used when initiating or leaving Expo.</_long>
 		    <default>0</default>
 		    <min>0</min>
-		    <max>2</max>
+		    <max>3</max>
 		    <desc>
 			<value>0</value>
 			<_name>Zoom</_name>
@@ -108,6 +108,10 @@
 			<value>2</value>
 			<_name>Vortex</_name>
 		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>None</_name>
+		    </desc>
 		</option>
 	    </group>
 	    <group>

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2016-05-16 06:23:55 +0000
+++ plugins/expo/src/expo.cpp	2016-06-30 05:21:32 +0000
@@ -402,10 +402,18 @@
     float val = (static_cast <float> (msSinceLastPaint) / 1000.0f) /
 		optionGetZoomTime ();
 
-    if (expoMode)
-	expoCam = MIN (1.0, expoCam + val);
-    else
-	expoCam = MAX (0.0, expoCam - val);
+    if (optionGetExpoAnimation() != ExpoScreen::ExpoAnimationNone) {
+	if (expoMode)
+	    expoCam = MIN (1.0, expoCam + val);
+	else
+	    expoCam = MAX (0.0, expoCam - val);
+    }
+    else {
+	if (expoMode)
+	    expoCam = 1;
+	else
+	    expoCam = 0;
+    }
 
     if (expoCam)
     {

=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in	2016-04-27 15:47:55 +0000
+++ plugins/scale/scale.xml.in	2016-06-30 05:21:32 +0000
@@ -139,6 +139,11 @@
 					<_name>On all output devices</_name>
 				</desc>
 			</option>
+			<option name="skip_animation" type="bool">
+				<_short>Skip Animation</_short>
+				<_long>Skips the scale plugin animation.</_long>
+				<default>false</default>
+			</option>
 	    </group>
 	    <group>
 		<_short>Bindings</_short>

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2016-05-17 02:53:00 +0000
+++ plugins/scale/src/scale.cpp	2016-06-30 05:21:32 +0000
@@ -932,9 +932,11 @@
     if (state != ScaleScreen::Idle && state != ScaleScreen::Wait)
     {
 	int   steps;
-	float amount, chunk;
-
-	amount = msSinceLastPaint * 0.05f * optionGetSpeed ();
+	float amount, chunk, speed;
+
+	speed = optionGetSkipAnimation() ? USHRT_MAX : optionGetSpeed();
+
+	amount = msSinceLastPaint * 0.05f * speed;
 	steps  = amount / (0.5f * optionGetTimestep ());
 
 	if (!steps)