Skip to content

AnimationSettings: Introduce get_animation_duration #2106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 7, 2024
Merged

AnimationSettings: Introduce get_animation_duration #2106

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1224eb4
AnimationSettings: Introduce get_animation_duration
leolost2605 Nov 2, 2024
daf1b0d
Mark inline
leolost2605 Nov 2, 2024
addbc0d
Use get_enable_animations
leolost2605 Nov 2, 2024
56c81d1
Merge branch 'main' into leolost/introduce-get-animation-duration
lenemter Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/AnimationsSettings.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,11 @@ namespace AnimationsSettings {

return enable_animations;
}

/**
* Utility that returns the given duration or 0 if animations are disabled.
*/
public inline uint get_animation_duration (uint duration) {
return enable_animations ? duration : 0;
}
}
14 changes: 7 additions & 7 deletions plugins/pip/PopupWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
opacity = 0;

save_easing_state ();
set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
set_easing_duration (AnimationsSettings.get_animation_duration (200));
opacity = 255;
restore_easing_state ();
}

public override void hide () {
opacity = 255;

var duration = AnimationsSettings.get_enable_animations () ? 200 : 0;
var duration = AnimationsSettings.get_animation_duration (200);
save_easing_state ();
set_easing_duration (duration);
opacity = 0;
Expand All @@ -173,7 +173,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
#else
public override bool enter_event (Clutter.CrossingEvent event) {
#endif
var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
var duration = AnimationsSettings.get_animation_duration (300);

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

close_button.save_easing_state ();
close_button.set_easing_duration (duration);
Expand Down Expand Up @@ -315,7 +315,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
}

private void on_close_click_clicked () {
var duration = AnimationsSettings.get_enable_animations () ? FADE_OUT_TIMEOUT : 0;
var duration = AnimationsSettings.get_animation_duration (FADE_OUT_TIMEOUT);

save_easing_state ();
set_easing_duration (duration);
Expand Down Expand Up @@ -449,7 +449,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
var screen_limit_start_y = SCREEN_MARGIN + monitor_y;
var screen_limit_end_y = monitor_height + monitor_y - SCREEN_MARGIN - height;

var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
var duration = AnimationsSettings.get_animation_duration (300);

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

var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
var duration = AnimationsSettings.get_animation_duration (300);

save_easing_state ();
set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/IconGroup.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ namespace Gala {
if (animate) {
icon.save_easing_state ();
icon.set_easing_mode (Clutter.AnimationMode.LINEAR);
icon.set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
icon.set_easing_duration (AnimationsSettings.get_animation_duration (200));
icon.opacity = 0;
icon.restore_easing_state ();

Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/MultitaskingView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ namespace Gala {

dock.save_easing_state ();
dock.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
dock.set_easing_duration (AnimationsSettings.get_enable_animations () ? ANIMATION_DURATION : 0);
dock.set_easing_duration (AnimationsSettings.get_animation_duration (ANIMATION_DURATION));
dock.y = target_y;
dock.restore_easing_state ();
};
Expand Down
16 changes: 8 additions & 8 deletions src/Widgets/WindowClone.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class Gala.WindowClone : Clutter.Actor {
public bool active {
set {
active_shape.save_easing_state ();
active_shape.set_easing_duration (AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0);
active_shape.set_easing_duration (AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION));
active_shape.opacity = value ? 255 : 0;
active_shape.restore_easing_state ();
}
Expand Down Expand Up @@ -400,7 +400,7 @@ public class Gala.WindowClone : Clutter.Actor {
return;
}

var duration = AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0;
var duration = AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION);

save_easing_state ();
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
Expand Down Expand Up @@ -485,7 +485,7 @@ public class Gala.WindowClone : Clutter.Actor {
return Clutter.EVENT_PROPAGATE;
}

var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);

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

close_button.save_easing_state ();
close_button.set_easing_mode (Clutter.AnimationMode.LINEAR);
Expand Down Expand Up @@ -643,7 +643,7 @@ public class Gala.WindowClone : Clutter.Actor {
active_shape.hide ();

var scale = window_icon.width / clone.width;
var duration = AnimationsSettings.get_enable_animations () ? FADE_ANIMATION_DURATION : 0;
var duration = AnimationsSettings.get_animation_duration (FADE_ANIMATION_DURATION);

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

var scale = hovered ? 0.4 : 1.0;
var opacity = hovered ? 0 : 255;
var duration = hovered && insert_thumb != null ? insert_thumb.delay : 100;
duration = AnimationsSettings.get_enable_animations () ? duration : 0;
uint duration = hovered && insert_thumb != null ? insert_thumb.delay : 100;
duration = AnimationsSettings.get_animation_duration (duration);

window_icon.save_easing_state ();

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

var duration = AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0;
var duration = AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION);

clone.set_pivot_point (0.0f, 0.0f);
clone.save_easing_state ();
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/WindowIconActor.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ namespace Gala {

new_icon.save_easing_state ();
new_icon.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
new_icon.set_easing_duration (AnimationsSettings.get_enable_animations () ? 500 : 0);
new_icon.set_easing_duration (AnimationsSettings.get_animation_duration (500));
new_icon.restore_easing_state ();

if (icon == null) {
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/WindowSwitcher/WindowSwitcher.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ public class Gala.WindowSwitcher : CanvasActor {
}

save_easing_state ();
set_easing_duration (AnimationsSettings.get_enable_animations () ? ANIMATION_DURATION : 0);
set_easing_duration (AnimationsSettings.get_animation_duration (ANIMATION_DURATION));
opacity = show ? 255 : 0;
restore_easing_state ();
}
Expand Down
8 changes: 4 additions & 4 deletions src/Widgets/WorkspaceClone.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,13 +388,13 @@ namespace Gala {

save_easing_state ();
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
set_x (target_x);
restore_easing_state ();

background.save_easing_state ();
background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
background.set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
background.set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
background.set_scale (scale, scale);
background.restore_easing_state ();
};
Expand Down Expand Up @@ -464,13 +464,13 @@ namespace Gala {

save_easing_state ();
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
set_x (target_x);
restore_easing_state ();

background.save_easing_state ();
background.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
background.set_easing_duration (AnimationsSettings.get_enable_animations () ? MultitaskingView.ANIMATION_DURATION : 0);
background.set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
background.set_scale (1, 1);
background.restore_easing_state ();
};
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/WorkspaceInsertThumb.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor {
private new void transform (bool expand) {
save_easing_state ();
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
set_easing_duration (AnimationsSettings.get_animation_duration (200));

if (!expand) {
remove_transition ("pulse");
Expand Down