From 777ad4ee5c8cf84b2bfa13c6bdb0d254c24881f9 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Thu, 28 Dec 2023 08:14:35 +0400 Subject: Rename window -> tile, fix popup unconstraining window_y I missed the window_y thing and found it thanks to the rename. Too lazy to split it into a commit. --- src/layout/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/layout/mod.rs') diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 8d454728..484a377a 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -141,7 +141,7 @@ pub struct Options { border: config::FocusRing, /// Column widths that `toggle_width()` switches between. preset_widths: Vec, - /// Initial width for new windows. + /// Initial width for new columns. default_width: Option, } @@ -717,7 +717,7 @@ impl Layout { } let col = &ws.columns[ws.active_column_idx]; - Some((&col.windows[col.active_window_idx].window(), &mon.output)) + Some((&col.tiles[col.active_tile_idx].window(), &mon.output)) } pub fn windows_for_output(&self, output: &Output) -> impl Iterator + '_ { @@ -1138,7 +1138,7 @@ impl Layout { let column = &ws.columns[ws.active_column_idx]; let width = column.width; let is_full_width = column.is_full_width; - let window = ws.remove_window_by_idx(ws.active_column_idx, column.active_window_idx); + let window = ws.remove_window_by_idx(ws.active_column_idx, column.active_tile_idx); let workspace_idx = monitors[new_idx].active_workspace_idx; self.add_window_by_idx(new_idx, workspace_idx, window, true, width, is_full_width); -- cgit