diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-02-07 16:32:38 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-02-07 16:32:38 +0400 |
| commit | 753a90430abbdf166a86b95c5c69aa1e68b3c412 (patch) | |
| tree | 78491ad15f528bb30b8a7755b6d7a45f1ad17270 /src/layout | |
| parent | f9085db5648bc6bad7fb0abf45e2a11f2e03d1af (diff) | |
| download | niri-753a90430abbdf166a86b95c5c69aa1e68b3c412.tar.gz niri-753a90430abbdf166a86b95c5c69aa1e68b3c412.tar.bz2 niri-753a90430abbdf166a86b95c5c69aa1e68b3c412.zip | |
animation: Accept ms as u32
Less boilerplate elsewhere.
Diffstat (limited to 'src/layout')
| -rw-r--r-- | src/layout/mod.rs | 2 | ||||
| -rw-r--r-- | src/layout/monitor.rs | 2 | ||||
| -rw-r--r-- | src/layout/tile.rs | 3 | ||||
| -rw-r--r-- | src/layout/workspace.rs | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 36f60d12..7c381358 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -1577,7 +1577,7 @@ impl<W: LayoutElement> Layout<W> { monitor.workspace_switch = Some(WorkspaceSwitch::Animation(Animation::new( current_idx, idx as f64, - Duration::from_millis(250), + 250, ))); return Some(monitor.output.clone()); diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs index 383ff965..accce645 100644 --- a/src/layout/monitor.rs +++ b/src/layout/monitor.rs @@ -96,7 +96,7 @@ impl<W: LayoutElement> Monitor<W> { self.workspace_switch = Some(WorkspaceSwitch::Animation(Animation::new( current_idx, idx as f64, - Duration::from_millis(250), + 250, ))); } diff --git a/src/layout/tile.rs b/src/layout/tile.rs index dfda6fbb..be96f6e6 100644 --- a/src/layout/tile.rs +++ b/src/layout/tile.rs @@ -114,8 +114,7 @@ impl<W: LayoutElement> Tile<W> { } pub fn start_open_animation(&mut self) { - self.open_animation = - Some(Animation::new(0., 1., Duration::from_millis(150)).with_curve(Curve::EaseOutExpo)); + self.open_animation = Some(Animation::new(0., 1., 150).with_curve(Curve::EaseOutExpo)); } pub fn window(&self) -> &W { diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index 24372074..9165d7e0 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -401,7 +401,7 @@ impl<W: LayoutElement> Workspace<W> { self.view_offset_anim = Some(Animation::new( self.view_offset as f64, new_view_offset as f64, - Duration::from_millis(250), + 250, )); } |