andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Extract mapped_hit_data()

Browse Source
This commit is contained in:
Ivan Molodetskikh
2025-04-24 21:36:47 +03:00
parent 929eaf0d69
commit 25f24f668c
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/niri.rs
+7 -5
View File
@@ -2990,10 +2990,7 @@ impl Niri {
let layer_toplevel_under = |layer| layer_surface_under(layer, false); let layer_toplevel_under = |layer| layer_surface_under(layer, false);
let layer_popup_under = |layer| layer_surface_under(layer, true); let layer_popup_under = |layer| layer_surface_under(layer, true);
let window_under = || { let mapped_hit_data = |(mapped, hit): (&Mapped, HitType)| {
self.layout
.window_under(output, pos_within_output)
.map(|(mapped, hit)| {
let window = &mapped.window; let window = &mapped.window;
let surface_and_pos = if let HitType::Input { win_pos } = hit { let surface_and_pos = if let HitType::Input { win_pos } = hit {
let win_pos_within_output = win_pos; let win_pos_within_output = win_pos;
@@ -3009,7 +3006,12 @@ impl Niri {
None None
}; };
(surface_and_pos, (Some((window.clone(), hit)), None)) (surface_and_pos, (Some((window.clone(), hit)), None))
}) };
let window_under = || {
self.layout
.window_under(output, pos_within_output)
.map(mapped_hit_data)
}; };
let mon = self.layout.monitor_for_output(output).unwrap(); let mon = self.layout.monitor_for_output(output).unwrap();