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

layout: Fix view jumps when removing a window on the left

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-04-09 22:34:41 +04:00
parent 956bf7c0a8
commit 301a2c0661
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/workspace.rs
+4 -8
View File
@@ -767,9 +767,6 @@ impl<W: LayoutElement> Workspace<W> {
self.activate_prev_column_on_removal = None; self.activate_prev_column_on_removal = None;
} }
// FIXME: activate_column below computes current view position to compute the new view
// position, which can include the column we're removing here. This leads to unwanted
// view jumps.
self.columns.remove(column_idx); self.columns.remove(column_idx);
if self.columns.is_empty() { if self.columns.is_empty() {
return window; return window;
@@ -778,7 +775,8 @@ impl<W: LayoutElement> Workspace<W> {
if column_idx < self.active_column_idx { if column_idx < self.active_column_idx {
// A column to the left was removed; preserve the current position. // A column to the left was removed; preserve the current position.
// FIXME: preserve activate_prev_column_on_removal. // FIXME: preserve activate_prev_column_on_removal.
self.activate_column(self.active_column_idx - 1); self.active_column_idx -= 1;
self.activate_prev_column_on_removal = None;
} else if column_idx == self.active_column_idx } else if column_idx == self.active_column_idx
&& self.activate_prev_column_on_removal.is_some() && self.activate_prev_column_on_removal.is_some()
{ {
@@ -822,9 +820,6 @@ impl<W: LayoutElement> Workspace<W> {
self.activate_prev_column_on_removal = None; self.activate_prev_column_on_removal = None;
} }
// FIXME: activate_column below computes current view position to compute the new view
// position, which can include the column we're removing here. This leads to unwanted
// view jumps.
if self.columns.is_empty() { if self.columns.is_empty() {
return column; return column;
} }
@@ -832,7 +827,8 @@ impl<W: LayoutElement> Workspace<W> {
if column_idx < self.active_column_idx { if column_idx < self.active_column_idx {
// A column to the left was removed; preserve the current position. // A column to the left was removed; preserve the current position.
// FIXME: preserve activate_prev_column_on_removal. // FIXME: preserve activate_prev_column_on_removal.
self.activate_column(self.active_column_idx - 1); self.active_column_idx -= 1;
self.activate_prev_column_on_removal = None;
} else if column_idx == self.active_column_idx } else if column_idx == self.active_column_idx
&& self.activate_prev_column_on_removal.is_some() && self.activate_prev_column_on_removal.is_some()
{ {