From 4c524b47196badd281bc159bef3137cf16f963e5 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sat, 20 Sep 2025 12:57:42 +0300 Subject: layout: Store Layout directly in Options --- src/layout/workspace.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/layout/workspace.rs') diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index 8c1c36d3..2d71ad1b 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -754,7 +754,7 @@ impl Workspace { Some(Some(width)) => Some(width), Some(None) => None, None if is_floating => None, - None => self.options.default_column_width, + None => self.options.layout.default_column_width, } } @@ -1272,11 +1272,12 @@ impl Workspace { // Come up with a default floating position close to the tile position. let stored_or_default = self.floating.stored_or_default_tile_pos(&removed.tile); if stored_or_default.is_none() { - let offset = if self.options.center_focused_column == CenterFocusedColumn::Always { - Point::from((0., 0.)) - } else { - Point::from((50., 50.)) - }; + let offset = + if self.options.layout.center_focused_column == CenterFocusedColumn::Always { + Point::from((0., 0.)) + } else { + Point::from((50., 50.)) + }; let pos = render_pos + offset; let size = removed.tile.tile_size(); let pos = self.floating.clamp_within_working_area(pos, size); -- cgit