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

Render active column in front

Browse Source 
Rather than just the active window. This is visible on the new window
movement animations.
This commit is contained in:
Ivan Molodetskikh
2024-04-08 19:48:52 +04:00
parent 4856522a7a
commit 6aceb3a798
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/workspace.rs
+31 -16
View File
@@ -1159,12 +1159,25 @@ impl<W: LayoutElement> Workspace<W> {
// Start with the active window since it's drawn on top. // Start with the active window since it's drawn on top.
let col = &self.columns[self.active_column_idx]; let col = &self.columns[self.active_column_idx];
let tile = &col.tiles[col.active_tile_idx]; let tile = &col.tiles[col.active_tile_idx];
let tile_pos = Point::from(( let tile_pos =
self.column_x(self.active_column_idx) - view_pos, Point::from((-self.view_offset, col.tile_y(col.active_tile_idx))) + col.render_offset();
col.tile_y(col.active_tile_idx),
)) + col.render_offset();
let first = iter::once((tile, tile_pos)); let first = iter::once((tile, tile_pos));
// Next, the rest of the tiles in the active column, since it should be drawn on top as a
// whole during animations.
let next =
zip(&col.tiles, col.tile_ys())
.enumerate()
.filter_map(move |(tile_idx, (tile, y))| {
if tile_idx == col.active_tile_idx {
// Active tile comes first.
return None;
}
let tile_pos = Point::from((-self.view_offset, y)) + col.render_offset();
Some((tile, tile_pos))
});
let mut x = -view_pos; let mut x = -view_pos;
let rest = self let rest = self
.columns .columns
@@ -1176,20 +1189,22 @@ impl<W: LayoutElement> Workspace<W> {
x += col.width() + self.options.gaps; x += col.width() + self.options.gaps;
rv rv
}) })
.flat_map(move |(col_idx, col, x)| { .filter_map(|(col_idx, col, x)| {
zip(&col.tiles, col.tile_ys()).enumerate().filter_map( if col_idx == self.active_column_idx {
move |(tile_idx, (tile, y))| { // Active column comes before.
if col_idx == self.active_column_idx && tile_idx == col.active_tile_idx { return None;
// Active tile comes first. }
return None;
}
let tile_pos = Point::from((x, y)) + col.render_offset(); Some((col, x))
Some((tile, tile_pos)) })
}, .flat_map(move |(col, x)| {
) zip(&col.tiles, col.tile_ys()).map(move |(tile, y)| {
let tile_pos = Point::from((x, y)) + col.render_offset();
(tile, tile_pos)
})
}); });
first.chain(rest)
first.chain(next).chain(rest)
} }
fn active_column_ref(&self) -> Option<&Column<W>> { fn active_column_ref(&self) -> Option<&Column<W>> {