diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2025-11-24 15:19:01 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-11-24 15:19:13 +0300 |
| commit | 9eeedff6295d17dd44594e2e8bcc1911f1535989 (patch) | |
| tree | 482b764078d535125270da265984dafad94a9fd3 /src/window | |
| parent | 0920ea9f9fdf0b744e79e8dea57d5945ba74f312 (diff) | |
| download | niri-9eeedff6295d17dd44594e2e8bcc1911f1535989.tar.gz niri-9eeedff6295d17dd44594e2e8bcc1911f1535989.tar.bz2 niri-9eeedff6295d17dd44594e2e8bcc1911f1535989.zip | |
Remove hand-written ResolvedWindowRules::empty()
It was only needed to be const fn.
Diffstat (limited to 'src/window')
| -rw-r--r-- | src/window/mod.rs | 73 |
1 files changed, 2 insertions, 71 deletions
diff --git a/src/window/mod.rs b/src/window/mod.rs index 89669fe1..c8c358f1 100644 --- a/src/window/mod.rs +++ b/src/window/mod.rs @@ -30,7 +30,7 @@ pub enum WindowRef<'a> { } /// Rules fully resolved for a window. -#[derive(Debug, PartialEq, Clone)] +#[derive(Debug, Default, PartialEq, Clone)] pub struct ResolvedWindowRules { /// Default width for this window. /// @@ -174,79 +174,10 @@ impl<'a> WindowRef<'a> { } impl ResolvedWindowRules { - pub const fn empty() -> Self { - Self { - default_width: None, - default_height: None, - default_column_display: None, - default_floating_position: None, - open_on_output: None, - open_on_workspace: None, - open_maximized: None, - open_maximized_to_edges: None, - open_fullscreen: None, - open_floating: None, - open_focused: None, - min_width: None, - min_height: None, - max_width: None, - max_height: None, - focus_ring: BorderRule { - off: false, - on: false, - width: None, - active_color: None, - inactive_color: None, - urgent_color: None, - active_gradient: None, - inactive_gradient: None, - urgent_gradient: None, - }, - border: BorderRule { - off: false, - on: false, - width: None, - active_color: None, - inactive_color: None, - urgent_color: None, - active_gradient: None, - inactive_gradient: None, - urgent_gradient: None, - }, - shadow: ShadowRule { - off: false, - on: false, - offset: None, - softness: None, - spread: None, - draw_behind_window: None, - color: None, - inactive_color: None, - }, - tab_indicator: TabIndicatorRule { - active_color: None, - inactive_color: None, - urgent_color: None, - active_gradient: None, - inactive_gradient: None, - urgent_gradient: None, - }, - draw_border_with_background: None, - opacity: None, - geometry_corner_radius: None, - clip_to_geometry: None, - baba_is_float: None, - block_out_from: None, - variable_refresh_rate: None, - scroll_factor: None, - tiled_state: None, - } - } - pub fn compute(rules: &[WindowRule], window: WindowRef, is_at_startup: bool) -> Self { let _span = tracy_client::span!("ResolvedWindowRules::compute"); - let mut resolved = ResolvedWindowRules::empty(); + let mut resolved = ResolvedWindowRules::default(); with_toplevel_role(window.toplevel(), |role| { // Ensure server_pending like in Smithay's with_pending_state(). |
