From 489a225fae57adba01057893d244c64c749bccfe Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 24 Dec 2023 18:00:46 +0400 Subject: Add and use remove_window_by_idx --- src/layout/monitor.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/layout/monitor.rs') 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 Monitor { 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 Monitor { 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 Monitor { 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); -- cgit