Skip to content

Commit 1224eb4

Browse files
leolost2605leolost2605
committed
AnimationSettings: Introduce get_animation_duration
1 parent b0a5f8a commit 1224eb4

File tree

9 files changed

+31
-24
lines changed

9 files changed

+31
-24
lines changed

‎lib/AnimationsSettings.vala‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@ namespace AnimationsSettings {
2222

2323
return enable_animations;
2424
}
25+
26+
/**
27+
* Utility that returns the given duration or 0 if animations are disabled.
28+
*/
29+
public uint get_animation_duration (uint duration) {
30+
return enable_animations ? duration : 0;
31+
}
2532
}

‎plugins/pip/PopupWindow.vala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
143143
opacity = 0;
144144

145145
save_easing_state ();
146-
set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
146+
set_easing_duration (AnimationsSettings.get_animation_duration (200));
147147
opacity = 255;
148148
restore_easing_state ();
149149
}
150150

151151
public override void hide () {
152152
opacity = 255;
153153

154-
var duration = AnimationsSettings.get_enable_animations () ? 200 : 0;
154+
var duration = AnimationsSettings.get_animation_duration (200);
155155
save_easing_state ();
156156
set_easing_duration (duration);
157157
opacity = 0;
@@ -173,7 +173,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
173173
#else
174174
public override bool enter_event (Clutter.CrossingEvent event) {
175175
#endif
176-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
176+
var duration = AnimationsSettings.get_animation_duration (300);
177177

178178
close_button.save_easing_state ();
179179
close_button.set_easing_duration (duration);
@@ -193,7 +193,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
193193
#else
194194
public override bool leave_event (Clutter.CrossingEvent event) {
195195
#endif
196-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
196+
var duration = AnimationsSettings.get_animation_duration (300);
197197

198198
close_button.save_easing_state ();
199199
close_button.set_easing_duration (duration);
@@ -315,7 +315,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
315315
}
316316

317317
private void on_close_click_clicked () {
318-
var duration = AnimationsSettings.get_enable_animations () ? FADE_OUT_TIMEOUT : 0;
318+
var duration = AnimationsSettings.get_animation_duration (FADE_OUT_TIMEOUT);
319319

320320
save_easing_state ();
321321
set_easing_duration (duration);
@@ -449,7 +449,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
449449
var screen_limit_start_y = SCREEN_MARGIN + monitor_y;
450450
var screen_limit_end_y = monitor_height + monitor_y - SCREEN_MARGIN - height;
451451

452-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
452+
var duration = AnimationsSettings.get_animation_duration (300);
453453

454454
save_easing_state ();
455455
set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
@@ -462,7 +462,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
462462
private bool place_window_off_screen () {
463463
off_screen = false;
464464

465-
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
465+
var duration = AnimationsSettings.get_animation_duration (300);
466466

467467
save_easing_state ();
468468
set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);

‎src/Widgets/IconGroup.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ namespace Gala {
165165
if (animate) {
166166
icon.save_easing_state ();
167167
icon.set_easing_mode (Clutter.AnimationMode.LINEAR);
168-
icon.set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
168+
icon.set_easing_duration (AnimationsSettings.get_animation_duration (200));
169169
icon.opacity = 0;
170170
icon.restore_easing_state ();
171171

‎src/Widgets/MultitaskingView.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ namespace Gala {
871871

872872
dock.save_easing_state ();
873873
dock.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
874-
dock.set_easing_duration (AnimationsSettings.get_enable_animations () ? ANIMATION_DURATION : 0);
874+
dock.set_easing_duration (AnimationsSettings.get_animation_duration (ANIMATION_DURATION));
875875
dock.y = target_y;
876876
dock.restore_easing_state ();
877877
};

‎src/Widgets/WindowClone.vala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class Gala.WindowClone : Clutter.Actor {
4747
public bool active {
4848
set {
4949
active_shape.save_easing_state ();
50-
active_shape.set_easing_duration (AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0);
50+
active_shape.set_easing_duration (AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION));
5151
active_shape.opacity = value ? 255 : 0;
5252
active_shape.restore_easing_state ();
5353
}
@@ -400,7 +400,7 @@ public class Gala.WindowClone : Clutter.Actor {
400400
return;
401401
}
402402

403-
var duration = AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0;
403+
var duration = AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION);
404404

405405
save_easing_state ();
406406
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
@@ -485,7 +485,7 @@ public class Gala.WindowClone : Clutter.Actor {
485485
return Clutter.EVENT_PROPAGATE;
486486
}
487487

488-
var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
488+
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);
489489

490490
close_button.save_easing_state ();
491491
close_button.set_easing_mode (Clutter.AnimationMode.LINEAR);
@@ -507,7 +507,7 @@ public class Gala.WindowClone : Clutter.Actor {
507507
#else
508508
public override bool leave_event (Clutter.CrossingEvent event) {
509509
#endif
510-
var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
510+
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);
511511

512512
close_button.save_easing_state ();
513513
close_button.set_easing_mode (Clutter.AnimationMode.LINEAR);
@@ -643,7 +643,7 @@ public class Gala.WindowClone : Clutter.Actor {
643643
active_shape.hide ();
644644

645645
var scale = window_icon.width / clone.width;
646-
var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
646+
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);
647647

648648
clone.get_transformed_position (out abs_x, out abs_y);
649649
clone.save_easing_state ();
@@ -701,8 +701,8 @@ public class Gala.WindowClone : Clutter.Actor {
701701

702702
var scale = hovered ? 0.4 : 1.0;
703703
var opacity = hovered ? 0 : 255;
704-
var duration = hovered && insert_thumb != null ? insert_thumb.delay : 100;
705-
duration = AnimationsSettings.get_enable_animations () ? duration : 0;
704+
uint duration = hovered && insert_thumb != null ? insert_thumb.delay : 100;
705+
duration = AnimationsSettings.get_animation_duration (duration);
706706

707707
window_icon.save_easing_state ();
708708

@@ -810,7 +810,7 @@ public class Gala.WindowClone : Clutter.Actor {
810810
get_parent ().remove_child (this);
811811
prev_parent.insert_child_at_index (this, prev_index);
812812

813-
var duration = AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0;
813+
var duration = AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION);
814814

815815
clone.set_pivot_point (0.0f, 0.0f);
816816
clone.save_easing_state ();

‎src/Widgets/WindowIconActor.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ namespace Gala {
147147

148148
new_icon.save_easing_state ();
149149
new_icon.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
150-
new_icon.set_easing_duration (AnimationsSettings.get_enable_animations () ? 500 : 0);
150+
new_icon.set_easing_duration (AnimationsSettings.get_animation_duration (500));
151151
new_icon.restore_easing_state ();
152152

153153
if (icon == null) {

‎src/Widgets/WindowSwitcher/WindowSwitcher.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public class Gala.WindowSwitcher : CanvasActor {
414414
}
415415

416416
save_easing_state ();
417-
set_easing_duration (AnimationsSettings.get_enable_animations () ? ANIMATION_DURATION : 0);
417+
set_easing_duration (AnimationsSettings.get_animation_duration (ANIMATION_DURATION));
418418
opacity = show ? 255 : 0;
419419
restore_easing_state ();
420420
}

‎src/Widgets/WorkspaceClone.vala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,13 +388,13 @@ namespace Gala {
388388

389389
save_easing_state ();
390390
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
391-
set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
391+
set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
392392
set_x (target_x);
393393
restore_easing_state ();
394394

395395
background.save_easing_state ();
396396
background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
397-
background.set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
397+
background.set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
398398
background.set_scale (scale, scale);
399399
background.restore_easing_state ();
400400
};
@@ -464,13 +464,13 @@ namespace Gala {
464464

465465
save_easing_state ();
466466
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
467-
set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
467+
set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
468468
set_x (target_x);
469469
restore_easing_state ();
470470

471471
background.save_easing_state ();
472472
background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
473-
background.set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
473+
background.set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
474474
background.set_scale (1, 1);
475475
background.restore_easing_state ();
476476
};

‎src/Widgets/WorkspaceInsertThumb.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor {
8484
private new void transform (bool expand) {
8585
save_easing_state ();
8686
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
87-
set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
87+
set_easing_duration (AnimationsSettings.get_animation_duration (200));
8888

8989
if (!expand) {
9090
remove_transition ("pulse");

0 commit comments

Comments
 (0)