diff --git a/src/layout/mod.rs b/src/layout/mod.rs index b084d428..442e31f4 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -2365,8 +2365,6 @@ impl Layout { use approx::assert_abs_diff_eq; - use crate::layout::monitor::WorkspaceSwitch; - let zoom = self.overview_zoom(); let mut move_win_id = None; @@ -2486,12 +2484,6 @@ impl Layout { let mut saw_view_offset_gesture = false; for (idx, monitor) in monitors.iter().enumerate() { - assert!( - !monitor.workspaces.is_empty(), - "monitor must have at least one workspace" - ); - assert!(monitor.active_workspace_idx < monitor.workspaces.len()); - assert_eq!(self.clock, monitor.clock); assert_eq!( monitor.options, self.options, @@ -2504,13 +2496,7 @@ impl Layout { monitor.overview_progress_value() ); - if let Some(WorkspaceSwitch::Animation(anim)) = &monitor.workspace_switch { - let before_idx = anim.from() as usize; - let after_idx = anim.to() as usize; - - assert!(before_idx < monitor.workspaces.len()); - assert!(after_idx < monitor.workspaces.len()); - } + monitor.verify_invariants(); if idx == primary_idx { for ws in &monitor.workspaces { @@ -2537,84 +2523,10 @@ impl Layout { ); } - assert!( - !monitor.workspaces.last().unwrap().has_windows(), - "monitor must have an empty workspace in the end" - ); - if monitor.options.layout.empty_workspace_above_first { - assert!( - !monitor.workspaces.first().unwrap().has_windows(), - "first workspace must be empty when empty_workspace_above_first is set" - ) - } - - assert!( - monitor.workspaces.last().unwrap().name.is_none(), - "monitor must have an unnamed workspace in the end" - ); - if monitor.options.layout.empty_workspace_above_first { - assert!( - monitor.workspaces.first().unwrap().name.is_none(), - "first workspace must be unnamed when empty_workspace_above_first is set" - ) - } - - if monitor.options.layout.empty_workspace_above_first { - assert!( - monitor.workspaces.len() != 2, - "if empty_workspace_above_first is set there must be just 1 or 3+ workspaces" - ) - } - - // If there's no workspace switch in progress, there can't be any non-last non-active - // empty workspaces. If empty_workspace_above_first is set then the first workspace - // will be empty too. - let pre_skip = if monitor.options.layout.empty_workspace_above_first { - 1 - } else { - 0 - }; - if monitor.workspace_switch.is_none() { - for (idx, ws) in monitor - .workspaces - .iter() - .enumerate() - .skip(pre_skip) - .rev() - // skip last - .skip(1) - { - if idx != monitor.active_workspace_idx { - assert!( - ws.has_windows_or_name(), - "non-active workspace can't be empty and unnamed except the last one" - ); - } - } - } - // FIXME: verify that primary doesn't have any workspaces for which their own monitor // exists. for workspace in &monitor.workspaces { - assert_eq!(self.clock, workspace.clock); - - assert_eq!( - monitor.scale().integer_scale(), - workspace.scale().integer_scale() - ); - assert_eq!( - monitor.scale().fractional_scale(), - workspace.scale().fractional_scale() - ); - assert_eq!(monitor.view_size(), workspace.view_size()); - assert_eq!(monitor.working_area(), workspace.working_area()); - - assert_eq!( - workspace.base_options, self.options, - "workspace options must be synchronized with layout" - ); - assert!( seen_workspace_id.insert(workspace.id()), "workspace id must be unique" @@ -2654,17 +2566,6 @@ impl Layout { } saw_view_offset_gesture = has_view_offset_gesture; } - - let scale = monitor.scale().fractional_scale(); - let iter = monitor.workspaces_with_render_geo(); - for (_ws, ws_geo) in iter { - let pos = ws_geo.loc; - let rounded_pos = pos.to_physical_precise_round(scale).to_logical(scale); - - // Workspace positions must be rounded to physical pixels. - assert_abs_diff_eq!(pos.x, rounded_pos.x, epsilon = 1e-5); - assert_abs_diff_eq!(pos.y, rounded_pos.y, epsilon = 1e-5); - } } } diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs index bcb6a5c3..21cbfcab 100644 --- a/src/layout/monitor.rs +++ b/src/layout/monitor.rs @@ -1881,4 +1881,110 @@ impl Monitor { pub fn working_area(&self) -> Rectangle { self.working_area } + + #[cfg(test)] + pub(super) fn verify_invariants(&self) { + use approx::assert_abs_diff_eq; + + assert!( + !self.workspaces.is_empty(), + "monitor must have at least one workspace" + ); + assert!(self.active_workspace_idx < self.workspaces.len()); + + if let Some(WorkspaceSwitch::Animation(anim)) = &self.workspace_switch { + let before_idx = anim.from() as usize; + let after_idx = anim.to() as usize; + + assert!(before_idx < self.workspaces.len()); + assert!(after_idx < self.workspaces.len()); + } + + assert!( + !self.workspaces.last().unwrap().has_windows(), + "monitor must have an empty workspace in the end" + ); + if self.options.layout.empty_workspace_above_first { + assert!( + !self.workspaces.first().unwrap().has_windows(), + "first workspace must be empty when empty_workspace_above_first is set" + ) + } + + assert!( + self.workspaces.last().unwrap().name.is_none(), + "monitor must have an unnamed workspace in the end" + ); + if self.options.layout.empty_workspace_above_first { + assert!( + self.workspaces.first().unwrap().name.is_none(), + "first workspace must be unnamed when empty_workspace_above_first is set" + ) + } + + if self.options.layout.empty_workspace_above_first { + assert!( + self.workspaces.len() != 2, + "if empty_workspace_above_first is set there must be just 1 or 3+ workspaces" + ) + } + + // If there's no workspace switch in progress, there can't be any non-last non-active + // empty workspaces. If empty_workspace_above_first is set then the first workspace + // will be empty too. + let pre_skip = if self.options.layout.empty_workspace_above_first { + 1 + } else { + 0 + }; + if self.workspace_switch.is_none() { + for (idx, ws) in self + .workspaces + .iter() + .enumerate() + .skip(pre_skip) + .rev() + // skip last + .skip(1) + { + if idx != self.active_workspace_idx { + assert!( + ws.has_windows_or_name(), + "non-active workspace can't be empty and unnamed except the last one" + ); + } + } + } + + for workspace in &self.workspaces { + assert_eq!(self.clock, workspace.clock); + + assert_eq!( + self.scale().integer_scale(), + workspace.scale().integer_scale() + ); + assert_eq!( + self.scale().fractional_scale(), + workspace.scale().fractional_scale() + ); + assert_eq!(self.view_size, workspace.view_size()); + assert_eq!(self.working_area, workspace.working_area()); + + assert_eq!( + workspace.base_options, self.options, + "workspace options must be synchronized with layout" + ); + } + + let scale = self.scale().fractional_scale(); + let iter = self.workspaces_with_render_geo(); + for (_ws, ws_geo) in iter { + let pos = ws_geo.loc; + let rounded_pos = pos.to_physical_precise_round(scale).to_logical(scale); + + // Workspace positions must be rounded to physical pixels. + assert_abs_diff_eq!(pos.x, rounded_pos.x, epsilon = 1e-5); + assert_abs_diff_eq!(pos.y, rounded_pos.y, epsilon = 1e-5); + } + } }