Simplify compositor and shell conditionals

Flatten nested guards in swipe cleanup, recording updates and popup dismissal. Use an eager optional fallback for workspace layouts and an array in the malformed-opacity test.

compositor/src/effects.rs

@@ -590,7 +590,7 @@ mod tests {
         assert_eq!(decode_region_opacities(&[]), Some(vec![]));
         assert!(decode_region_opacities(&bytes[..11]).is_none());
         assert!(decode_region_opacities(&1001u32.to_ne_bytes()).is_none());
-        assert!(decode_region_opacities(&vec![0; 33 * 4]).is_none());
+        assert!(decode_region_opacities(&[0; 33 * 4]).is_none());
     }
 
     #[test]

compositor/src/state/animation.rs

@@ -160,12 +160,11 @@ impl Ferese {
             .focus_swipe
             .as_ref()
             .is_some_and(|swipe| !self.focus_swipe_is_current(swipe))
+            && let Some(swipe) = self.focus_swipe.take()
         {
-            if let Some(swipe) = self.focus_swipe.take() {
-                self.presentation_dependencies
-                    .restore_viewport(swipe.workspace, swipe.dependencies);
-                self.release_presentation_dependencies();
-            }
+            self.presentation_dependencies
+                .restore_viewport(swipe.workspace, swipe.dependencies);
+            self.release_presentation_dependencies();
         }
 
         let mut active_animation = false;

compositor/src/state/presentation_dependencies.rs

@@ -330,7 +330,7 @@ impl Ferese {
                 .as_ref()
                 .filter(|swipe| swipe.workspace == workspace.id)
                 .and_then(|swipe| swipe.layout.as_ref())
-                .or_else(|| match &workspace.layout {
+                .or(match &workspace.layout {
                     WorkspaceLayout::Scrolling(layout) => Some(layout),
                     _ => None,
                 });