andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-21 02:01:55 +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
+19 -17
View File
@@ -2990,26 +2990,28 @@ impl Niri {
let layer_toplevel_under = |layer| layer_surface_under(layer, false);
let layer_popup_under = |layer| layer_surface_under(layer, true);
let mapped_hit_data = |(mapped, hit): (&Mapped, HitType)| {
let window = &mapped.window;
let surface_and_pos = if let HitType::Input { win_pos } = hit {
let win_pos_within_output = win_pos;
window
.surface_under(
pos_within_output - win_pos_within_output,
WindowSurfaceType::ALL,
)
.map(|(s, pos_within_window)| {
(s, pos_within_window.to_f64() + win_pos_within_output)
})
} else {
None
};
(surface_and_pos, (Some((window.clone(), hit)), None))
};
let window_under = || {
self.layout
.window_under(output, pos_within_output)
.map(|(mapped, hit)| {
let window = &mapped.window;
let surface_and_pos = if let HitType::Input { win_pos } = hit {
let win_pos_within_output = win_pos;
window
.surface_under(
pos_within_output - win_pos_within_output,
WindowSurfaceType::ALL,
)
.map(|(s, pos_within_window)| {
(s, pos_within_window.to_f64() + win_pos_within_output)
})
} else {
None
};
(surface_and_pos, (Some((window.clone(), hit)), None))
})
.map(mapped_hit_data)
};
let mon = self.layout.monitor_for_output(output).unwrap();