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

Pass prev_idx explicitly to animate_view_offset_to_column()

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-02-29 08:30:46 +04:00
parent 8018839f5d
commit 55038b7c07
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/workspace.rs
+16 -10
View File
@@ -459,14 +459,24 @@ impl<W: LayoutElement> Workspace<W> {
self.animate_view_offset(current_x, idx, new_view_offset); self.animate_view_offset(current_x, idx, new_view_offset);
} }
fn animate_view_offset_to_column(&mut self, current_x: i32, idx: usize) { fn animate_view_offset_to_column(
&mut self,
current_x: i32,
idx: usize,
prev_idx: Option<usize>,
) {
match self.options.center_focused_column { match self.options.center_focused_column {
CenterFocusedColumn::Always => { CenterFocusedColumn::Always => {
self.animate_view_offset_to_column_centered(current_x, idx) self.animate_view_offset_to_column_centered(current_x, idx)
} }
CenterFocusedColumn::OnOverflow => { CenterFocusedColumn::OnOverflow => {
let Some(prev_idx) = prev_idx else {
self.animate_view_offset_to_column_fit(current_x, idx);
return;
};
// Always take the left or right neighbor of the target as the source. // Always take the left or right neighbor of the target as the source.
let source_idx = if self.active_column_idx > idx { let source_idx = if prev_idx > idx {
min(idx + 1, self.columns.len() - 1) min(idx + 1, self.columns.len() - 1)
} else { } else {
idx.saturating_sub(1) idx.saturating_sub(1)
@@ -503,7 +513,7 @@ impl<W: LayoutElement> Workspace<W> {
} }
let current_x = self.view_pos(); let current_x = self.view_pos();
self.animate_view_offset_to_column(current_x, idx); self.animate_view_offset_to_column(current_x, idx, Some(self.active_column_idx));
self.active_column_idx = idx; self.active_column_idx = idx;
@@ -770,13 +780,9 @@ impl<W: LayoutElement> Workspace<W> {
// We might need to move the view to ensure the resized window is still visible. // We might need to move the view to ensure the resized window is still visible.
let current_x = self.view_pos(); let current_x = self.view_pos();
if self.options.center_focused_column == CenterFocusedColumn::Always { // FIXME: we will want to skip the animation in some cases here to make continuously
// FIXME: we will want to skip the animation in some cases here to make // resizing windows not look janky.
// continuously resizing windows not look janky. self.animate_view_offset_to_column(current_x, idx, None);
self.animate_view_offset_to_column_centered(current_x, idx);
} else {
self.animate_view_offset_to_column_fit(current_x, idx);
}
} }
} }