From be2e551a89abb98099f094f73889d6d0cc46c87c Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 24 Dec 2023 17:38:13 +0400 Subject: Move clones up from find_window_and_output --- src/niri.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/niri.rs') diff --git a/src/niri.rs b/src/niri.rs index f09be356..a0a98c90 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -1222,7 +1222,7 @@ impl Niri { .or_else(|| self.global_space.outputs().next()) } - pub fn output_for_root(&self, root: &WlSurface) -> Option { + pub fn output_for_root(&self, root: &WlSurface) -> Option<&Output> { // Check the main layout. let win_out = self.layout.find_window_and_output(root); let layout_output = win_out.map(|(_, output)| output); @@ -1233,7 +1233,7 @@ impl Niri { .layer_for_surface(root, WindowSurfaceType::TOPLEVEL) .is_some() }; - let layer_shell_output = || self.layout.outputs().find(has_layer_surface).cloned(); + let layer_shell_output = || self.layout.outputs().find(has_layer_surface); layout_output.or_else(layer_shell_output) } -- cgit