fix: check for layer surface under cursor when clicking

YaLTeR · Dec 21, 2024 · d62944c · d62944c
1 parent d35ad73
commit d62944c
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/niri.rs b/src/niri.rs
@@ -2408,7 +2408,18 @@ impl Niri {
 
         // Check if some layer-shell surface is on top.
         let layers = layer_map_for_output(output);
-        let layer_under = |layer| layers.layer_under(layer, pos_within_output).is_some();
+        let layer_under = |layer| {
+            layers
+                .layer_under(layer, pos_within_output)
+                .and_then(|layer| {
+                    let layer_pos_within_output = layers.layer_geometry(layer)?.loc.to_f64();
+                    layer.surface_under(
+                        pos_within_output - layer_pos_within_output,
+                        WindowSurfaceType::ALL,
+                    )
+                })
+                .is_some()
+        };
         if layer_under(Layer::Overlay) {
             return None;
         }
@@ -2480,8 +2491,7 @@ impl Niri {
             layers
                 .layer_under(layer, pos_within_output)
                 .and_then(|layer| {
-                    let layer_pos_within_output =
-                        layers.layer_geometry(layer).unwrap().loc.to_f64();
+                    let layer_pos_within_output = layers.layer_geometry(layer)?.loc.to_f64();
                     layer
                         .surface_under(
                             pos_within_output - layer_pos_within_output,