diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-04-18 17:36:12 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-04-18 17:36:12 +0400 |
| commit | 65c342f2cb814df4fb6e15123c919084d5465240 (patch) | |
| tree | a2faeb8497c95aa4e258d9799bf8a119ad2cd118 | |
| parent | 47f6c85f64a20a9e32bf402941ecb78065aff80a (diff) | |
| download | niri-65c342f2cb814df4fb6e15123c919084d5465240.tar.gz niri-65c342f2cb814df4fb6e15123c919084d5465240.tar.bz2 niri-65c342f2cb814df4fb6e15123c919084d5465240.zip | |
config: Rearrange animations in struct
| -rw-r--r-- | niri-config/src/lib.rs | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index d8e8bfd5..d2bb506d 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -486,14 +486,14 @@ pub struct Animations { #[knuffel(child, default)] pub workspace_switch: WorkspaceSwitchAnim, #[knuffel(child, default)] - pub horizontal_view_movement: HorizontalViewMovementAnim, - #[knuffel(child, default)] - pub window_movement: WindowMovementAnim, - #[knuffel(child, default)] pub window_open: WindowOpenAnim, #[knuffel(child, default)] pub window_close: WindowCloseAnim, #[knuffel(child, default)] + pub horizontal_view_movement: HorizontalViewMovementAnim, + #[knuffel(child, default)] + pub window_movement: WindowMovementAnim, + #[knuffel(child, default)] pub window_resize: WindowResizeAnim, #[knuffel(child, default)] pub config_notification_open_close: ConfigNotificationOpenCloseAnim, @@ -532,94 +532,94 @@ impl Default for WorkspaceSwitchAnim { } #[derive(Debug, Clone, Copy, PartialEq)] -pub struct HorizontalViewMovementAnim(pub Animation); +pub struct WindowOpenAnim(pub Animation); -impl Default for HorizontalViewMovementAnim { +impl Default for WindowOpenAnim { fn default() -> Self { Self(Animation { off: false, - kind: AnimationKind::Spring(SpringParams { - damping_ratio: 1., - stiffness: 800, - epsilon: 0.0001, + kind: AnimationKind::Easing(EasingParams { + duration_ms: 150, + curve: AnimationCurve::EaseOutExpo, }), }) } } #[derive(Debug, Clone, Copy, PartialEq)] -pub struct WindowMovementAnim(pub Animation); +pub struct WindowCloseAnim(pub Animation); -impl Default for WindowMovementAnim { +impl Default for WindowCloseAnim { fn default() -> Self { Self(Animation { off: false, - kind: AnimationKind::Spring(SpringParams { - damping_ratio: 1., - stiffness: 800, - epsilon: 0.0001, + kind: AnimationKind::Easing(EasingParams { + duration_ms: 150, + curve: AnimationCurve::EaseOutQuad, }), }) } } #[derive(Debug, Clone, Copy, PartialEq)] -pub struct ConfigNotificationOpenCloseAnim(pub Animation); +pub struct HorizontalViewMovementAnim(pub Animation); -impl Default for ConfigNotificationOpenCloseAnim { +impl Default for HorizontalViewMovementAnim { fn default() -> Self { Self(Animation { off: false, kind: AnimationKind::Spring(SpringParams { - damping_ratio: 0.6, - stiffness: 1000, - epsilon: 0.001, + damping_ratio: 1., + stiffness: 800, + epsilon: 0.0001, }), }) } } #[derive(Debug, Clone, Copy, PartialEq)] -pub struct WindowOpenAnim(pub Animation); +pub struct WindowMovementAnim(pub Animation); -impl Default for WindowOpenAnim { +impl Default for WindowMovementAnim { fn default() -> Self { Self(Animation { off: false, - kind: AnimationKind::Easing(EasingParams { - duration_ms: 150, - curve: AnimationCurve::EaseOutExpo, + kind: AnimationKind::Spring(SpringParams { + damping_ratio: 1., + stiffness: 800, + epsilon: 0.0001, }), }) } } #[derive(Debug, Clone, Copy, PartialEq)] -pub struct WindowCloseAnim(pub Animation); +pub struct WindowResizeAnim(pub Animation); -impl Default for WindowCloseAnim { +impl Default for WindowResizeAnim { fn default() -> Self { Self(Animation { off: false, - kind: AnimationKind::Easing(EasingParams { - duration_ms: 150, - curve: AnimationCurve::EaseOutQuad, + kind: AnimationKind::Spring(SpringParams { + damping_ratio: 1., + stiffness: 800, + epsilon: 0.0001, }), }) } } #[derive(Debug, Clone, Copy, PartialEq)] -pub struct WindowResizeAnim(pub Animation); +pub struct ConfigNotificationOpenCloseAnim(pub Animation); -impl Default for WindowResizeAnim { +impl Default for ConfigNotificationOpenCloseAnim { fn default() -> Self { Self(Animation { off: false, kind: AnimationKind::Spring(SpringParams { - damping_ratio: 1., - stiffness: 800, - epsilon: 0.0001, + damping_ratio: 0.6, + stiffness: 1000, + epsilon: 0.001, }), }) } |
