andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Implement vertical window move animations

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-04-15 21:19:09 +04:00
parent 568fbe26fe
commit 69f723d68a
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/workspace.rs
+26 -2
View File
@@ -2250,9 +2250,19 @@ impl<W: LayoutElement> Column<W> {
return;
}
let mut ys = self.tile_ys().skip(self.active_tile_idx);
let active_y = ys.next().unwrap();
let next_y = ys.next().unwrap();
drop(ys);
self.tiles.swap(self.active_tile_idx, new_idx);
self.heights.swap(self.active_tile_idx, new_idx);
self.active_tile_idx = new_idx;
// Animate the movement.
let new_active_y = self.tile_y(new_idx);
self.tiles[new_idx].animate_move_from(Point::from((0, active_y - new_active_y)));
self.tiles[new_idx + 1].animate_move_from(Point::from((0, active_y - next_y)));
}
fn move_down(&mut self) {
@@ -2261,9 +2271,19 @@ impl<W: LayoutElement> Column<W> {
return;
}
let mut ys = self.tile_ys().skip(self.active_tile_idx);
let active_y = ys.next().unwrap();
let next_y = ys.next().unwrap();
drop(ys);
self.tiles.swap(self.active_tile_idx, new_idx);
self.heights.swap(self.active_tile_idx, new_idx);
self.active_tile_idx = new_idx;
// Animate the movement.
let new_active_y = self.tile_y(new_idx);
self.tiles[new_idx].animate_move_from(Point::from((0, active_y - new_active_y)));
self.tiles[new_idx - 1].animate_move_from(Point::from((0, next_y - active_y)));
}
#[cfg(test)]
@@ -2431,9 +2451,13 @@ impl<W: LayoutElement> Column<W> {
y = self.working_area.loc.y + self.options.gaps;
}
self.tiles.iter().map(move |tile| {
let heights = self.tiles.iter().map(|tile| tile.tile_size().h);
// Chain an arbitrary height to be able to get the Y that the next tile past the end would
// have.
heights.chain(iter::once(0)).map(move |h| {
let pos = y;
y += tile.tile_size().h + self.options.gaps;
y += h + self.options.gaps;
pos
})
}