TH - speed up comp evffects too and allow duration multiply as well

author: Carsten Haitzler (Rasterman) <raster@rasterman.com> 2020-02-13 12:09:00 +0000
committer: Carsten Haitzler (Rasterman) <raster@rasterman.com> 2020-02-13 12:09:00 +0000
commit: be70ea8a525a8c3108e1bef2be8b0bff582eaef2 (patch)
tree: 70c0e4ee554f18b5be3cd3d348d83ccd58baf9da /data/elementary/themes
parent: a664836bbdf7fed6bb1ff10b8316b8faaa96c113 (diff)
1 files changed, 18 insertions, 18 deletions
diff --git a/data/elementary/themes/edc/comp_effects.edc b/data/elementary/themes/edc/comp_effects.edc
index 4135ddda4b..6384f1a7eb 100644
--- a/data/elementary/themes/edc/comp_effects.edc
+++ b/data/elementary/themes/edc/comp_effects.edc
@@ -1,5 +1,5 @@
-#define COMP_EFFECT_DURATION 0.4
+#define COMP_EFFECT_DURATION 0.2
-#define COMP_EFFECT_DURATION_FAST 0.2
+#define COMP_EFFECT_DURATION_FAST 0.15
 group { name: "e/comp/effects/none";
   parts {
@@ -55,7 +55,7 @@ group { name: "e/comp/effects/move";
         source: "e";
         filter: "mover" "default";
         action: STATE_SET "custom" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -65,7 +65,7 @@ group { name: "e/comp/effects/move";
         source: "e";
         filter: "mover" "custom";
         action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -135,7 +135,7 @@ group { name: "e/comp/effects/auto/pane";
         source: "e";
         filter: "mover" "default";
         action: STATE_SET "custom" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -145,7 +145,7 @@ group { name: "e/comp/effects/auto/pane";
         source: "e";
         filter: "mover" "custom";
         action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -298,7 +298,7 @@ group { name: "e/comp/effects/auto/zoom";
         source: "e";
         filter: "mover" "default";
         action: STATE_SET "hidden" 0.0;
-         transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "clip";
      }
      program {
@@ -307,7 +307,7 @@ group { name: "e/comp/effects/auto/zoom";
         source: "e";
         filter: "mover" "custom";
         action: STATE_SET "default" 0.0;
-         transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "clip";
      }
   }
@@ -358,7 +358,7 @@ group { name: "e/comp/effects/auto/blend";
         source: "e";
         filter: "clip" "default";
         action: STATE_SET "hidden" 0.0;
-         transition: LINEAR COMP_EFFECT_DURATION CURRENT;
+         transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "clip";
         after: "done";
      }
@@ -368,7 +368,7 @@ group { name: "e/comp/effects/auto/blend";
         source: "e";
         filter: "clip" "hidden";
         action: STATE_SET "default" 0.0;
-         transition: LINEAR COMP_EFFECT_DURATION CURRENT;
+         transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "clip";
         after: "done";
      }
@@ -453,7 +453,7 @@ group { name: "e/comp/effects/visibility/vertical";
         source: "e";
         filter: "clip" "default";
         action: STATE_SET "hid" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "clip";
         after: "done";
      }
@@ -463,7 +463,7 @@ group { name: "e/comp/effects/visibility/vertical";
         source: "e";
         filter: "clip" "hid";
         action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "clip";
         after: "done";
      }
@@ -547,7 +547,7 @@ group { name: "e/comp/effects/visibility/tooltip";
         source: "e";
         filter: "mover" "default";
         action: STATE_SET "custom" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -557,7 +557,7 @@ group { name: "e/comp/effects/visibility/tooltip";
         source: "e";
         filter: "mover" "custom";
         action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -626,7 +626,7 @@ group { name: "e/comp/effects/iconify/default";
         source: "e";
         filter: "mover" "default";
         action: STATE_SET "custom" 0.0;
-         transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 CURRENT;
+         transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -636,7 +636,7 @@ group { name: "e/comp/effects/iconify/default";
         source: "e";
         filter: "mover" "custom";
         action: STATE_SET "default" 0.0;
-         transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 CURRENT;
+         transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 USE_DURATION_FACTOR 1 CURRENT;
         target: "mover";
         after: "done";
      }
@@ -716,7 +716,7 @@ group { name: "e/comp/effects/auto/rotate";
         signal: "e,action,go";
         source: "e";
         action: STATE_SET "hidden" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "proxy";
      }
      program {
@@ -724,7 +724,7 @@ group { name: "e/comp/effects/auto/rotate";
         signal: "e,action,go";
         source: "e";
         action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
         target: "proxy";
      }
   }
author	Carsten Haitzler (Rasterman) <raster@rasterman.com>	2020-02-13 12:09:00 +0000
committer	Carsten Haitzler (Rasterman) <raster@rasterman.com>	2020-02-13 12:09:00 +0000
commit	be70ea8a525a8c3108e1bef2be8b0bff582eaef2 (patch)
tree	70c0e4ee554f18b5be3cd3d348d83ccd58baf9da /data/elementary/themes
parent	a664836bbdf7fed6bb1ff10b8316b8faaa96c113 (diff)

diff --git a/data/elementary/themes/edc/comp_effects.edc b/data/elementary/themes/edc/comp_effects.edc index 4135ddda4b..6384f1a7eb 100644 --- a/data/elementary/themes/edc/comp_effects.edc +++ b/data/elementary/themes/edc/comp_effects.edc
@@ -1,5 +1,5 @@
1	#define COMP_EFFECT_DURATION 0.4	1	#define COMP_EFFECT_DURATION 0.2
2	#define COMP_EFFECT_DURATION_FAST 0.2	2	#define COMP_EFFECT_DURATION_FAST 0.15
3		3
4	group { name: "e/comp/effects/none";	4	group { name: "e/comp/effects/none";
5	parts {	5	parts {
@@ -55,7 +55,7 @@ group { name: "e/comp/effects/move";
55	source: "e";	55	source: "e";
56	filter: "mover" "default";	56	filter: "mover" "default";
57	action: STATE_SET "custom" 0.0;	57	action: STATE_SET "custom" 0.0;
58	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	58	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
59	target: "mover";	59	target: "mover";
60	after: "done";	60	after: "done";
61	}	61	}
@@ -65,7 +65,7 @@ group { name: "e/comp/effects/move";
65	source: "e";	65	source: "e";
66	filter: "mover" "custom";	66	filter: "mover" "custom";
67	action: STATE_SET "default" 0.0;	67	action: STATE_SET "default" 0.0;
68	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	68	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
69	target: "mover";	69	target: "mover";
70	after: "done";	70	after: "done";
71	}	71	}
@@ -135,7 +135,7 @@ group { name: "e/comp/effects/auto/pane";
135	source: "e";	135	source: "e";
136	filter: "mover" "default";	136	filter: "mover" "default";
137	action: STATE_SET "custom" 0.0;	137	action: STATE_SET "custom" 0.0;
138	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	138	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
139	target: "mover";	139	target: "mover";
140	after: "done";	140	after: "done";
141	}	141	}
@@ -145,7 +145,7 @@ group { name: "e/comp/effects/auto/pane";
145	source: "e";	145	source: "e";
146	filter: "mover" "custom";	146	filter: "mover" "custom";
147	action: STATE_SET "default" 0.0;	147	action: STATE_SET "default" 0.0;
148	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	148	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
149	target: "mover";	149	target: "mover";
150	after: "done";	150	after: "done";
151	}	151	}
@@ -298,7 +298,7 @@ group { name: "e/comp/effects/auto/zoom";
298	source: "e";	298	source: "e";
299	filter: "mover" "default";	299	filter: "mover" "default";
300	action: STATE_SET "hidden" 0.0;	300	action: STATE_SET "hidden" 0.0;
301	transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;	301	transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
302	target: "clip";	302	target: "clip";
303	}	303	}
304	program {	304	program {
@@ -307,7 +307,7 @@ group { name: "e/comp/effects/auto/zoom";
307	source: "e";	307	source: "e";
308	filter: "mover" "custom";	308	filter: "mover" "custom";
309	action: STATE_SET "default" 0.0;	309	action: STATE_SET "default" 0.0;
310	transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;	310	transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
311	target: "clip";	311	target: "clip";
312	}	312	}
313	}	313	}
@@ -358,7 +358,7 @@ group { name: "e/comp/effects/auto/blend";
358	source: "e";	358	source: "e";
359	filter: "clip" "default";	359	filter: "clip" "default";
360	action: STATE_SET "hidden" 0.0;	360	action: STATE_SET "hidden" 0.0;
361	transition: LINEAR COMP_EFFECT_DURATION CURRENT;	361	transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
362	target: "clip";	362	target: "clip";
363	after: "done";	363	after: "done";
364	}	364	}
@@ -368,7 +368,7 @@ group { name: "e/comp/effects/auto/blend";
368	source: "e";	368	source: "e";
369	filter: "clip" "hidden";	369	filter: "clip" "hidden";
370	action: STATE_SET "default" 0.0;	370	action: STATE_SET "default" 0.0;
371	transition: LINEAR COMP_EFFECT_DURATION CURRENT;	371	transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
372	target: "clip";	372	target: "clip";
373	after: "done";	373	after: "done";
374	}	374	}
@@ -453,7 +453,7 @@ group { name: "e/comp/effects/visibility/vertical";
453	source: "e";	453	source: "e";
454	filter: "clip" "default";	454	filter: "clip" "default";
455	action: STATE_SET "hid" 0.0;	455	action: STATE_SET "hid" 0.0;
456	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	456	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
457	target: "clip";	457	target: "clip";
458	after: "done";	458	after: "done";
459	}	459	}
@@ -463,7 +463,7 @@ group { name: "e/comp/effects/visibility/vertical";
463	source: "e";	463	source: "e";
464	filter: "clip" "hid";	464	filter: "clip" "hid";
465	action: STATE_SET "default" 0.0;	465	action: STATE_SET "default" 0.0;
466	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	466	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
467	target: "clip";	467	target: "clip";
468	after: "done";	468	after: "done";
469	}	469	}
@@ -547,7 +547,7 @@ group { name: "e/comp/effects/visibility/tooltip";
547	source: "e";	547	source: "e";
548	filter: "mover" "default";	548	filter: "mover" "default";
549	action: STATE_SET "custom" 0.0;	549	action: STATE_SET "custom" 0.0;
550	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	550	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
551	target: "mover";	551	target: "mover";
552	after: "done";	552	after: "done";
553	}	553	}
@@ -557,7 +557,7 @@ group { name: "e/comp/effects/visibility/tooltip";
557	source: "e";	557	source: "e";
558	filter: "mover" "custom";	558	filter: "mover" "custom";
559	action: STATE_SET "default" 0.0;	559	action: STATE_SET "default" 0.0;
560	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	560	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
561	target: "mover";	561	target: "mover";
562	after: "done";	562	after: "done";
563	}	563	}
@@ -626,7 +626,7 @@ group { name: "e/comp/effects/iconify/default";
626	source: "e";	626	source: "e";
627	filter: "mover" "default";	627	filter: "mover" "default";
628	action: STATE_SET "custom" 0.0;	628	action: STATE_SET "custom" 0.0;
629	transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 CURRENT;	629	transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 USE_DURATION_FACTOR 1 CURRENT;
630	target: "mover";	630	target: "mover";
631	after: "done";	631	after: "done";
632	}	632	}
@@ -636,7 +636,7 @@ group { name: "e/comp/effects/iconify/default";
636	source: "e";	636	source: "e";
637	filter: "mover" "custom";	637	filter: "mover" "custom";
638	action: STATE_SET "default" 0.0;	638	action: STATE_SET "default" 0.0;
639	transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 CURRENT;	639	transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 USE_DURATION_FACTOR 1 CURRENT;
640	target: "mover";	640	target: "mover";
641	after: "done";	641	after: "done";
642	}	642	}
@@ -716,7 +716,7 @@ group { name: "e/comp/effects/auto/rotate";
716	signal: "e,action,go";	716	signal: "e,action,go";
717	source: "e";	717	source: "e";
718	action: STATE_SET "hidden" 0.0;	718	action: STATE_SET "hidden" 0.0;
719	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	719	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
720	target: "proxy";	720	target: "proxy";
721	}	721	}
722	program {	722	program {
@@ -724,7 +724,7 @@ group { name: "e/comp/effects/auto/rotate";
724	signal: "e,action,go";	724	signal: "e,action,go";
725	source: "e";	725	source: "e";
726	action: STATE_SET "default" 0.0;	726	action: STATE_SET "default" 0.0;
727	transition: DECELERATE COMP_EFFECT_DURATION CURRENT;	727	transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
728	target: "proxy";	728	target: "proxy";
729	}	729	}
730	}	730	}