diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2023-12-24 18:00:46 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2023-12-24 18:00:46 +0400 |
| commit | 489a225fae57adba01057893d244c64c749bccfe (patch) | |
| tree | 0afc05b4f4552142e24dccbc905c36753f314f85 /src/layout/monitor.rs | |
| parent | 85cb4b42f6f0f1b445957381f8ec65571ece2ad5 (diff) | |
| download | niri-489a225fae57adba01057893d244c64c749bccfe.tar.gz niri-489a225fae57adba01057893d244c64c749bccfe.tar.bz2 niri-489a225fae57adba01057893d244c64c749bccfe.zip | |
Add and use remove_window_by_idx
Diffstat (limited to 'src/layout/monitor.rs')
| -rw-r--r-- | src/layout/monitor.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs index 0fe7af00..bf3b61e0 100644 --- a/src/layout/monitor.rs +++ b/src/layout/monitor.rs @@ -249,11 +249,11 @@ impl<W: LayoutElement> Monitor<W> { return; } - let column = &mut workspace.columns[workspace.active_column_idx]; + let column = &workspace.columns[workspace.active_column_idx]; let width = column.width; let is_full_width = column.is_full_width; - let window = column.windows[column.active_window_idx].clone(); - workspace.remove_window(&window); + let window = + workspace.remove_window_by_idx(workspace.active_column_idx, column.active_window_idx); self.add_window(new_idx, window, true, width, is_full_width); } @@ -271,11 +271,11 @@ impl<W: LayoutElement> Monitor<W> { return; } - let column = &mut workspace.columns[workspace.active_column_idx]; + let column = &workspace.columns[workspace.active_column_idx]; let width = column.width; let is_full_width = column.is_full_width; - let window = column.windows[column.active_window_idx].clone(); - workspace.remove_window(&window); + let window = + workspace.remove_window_by_idx(workspace.active_column_idx, column.active_window_idx); self.add_window(new_idx, window, true, width, is_full_width); } @@ -293,11 +293,11 @@ impl<W: LayoutElement> Monitor<W> { return; } - let column = &mut workspace.columns[workspace.active_column_idx]; + let column = &workspace.columns[workspace.active_column_idx]; let width = column.width; let is_full_width = column.is_full_width; - let window = column.windows[column.active_window_idx].clone(); - workspace.remove_window(&window); + let window = + workspace.remove_window_by_idx(workspace.active_column_idx, column.active_window_idx); self.add_window(new_idx, window, true, width, is_full_width); |