entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

Merge pull request #688 from mahkoh/jorth/subsurface-tray-item-2

Browse source 
wl_subsurface: various fixes
This commit is contained in:
mahkoh 2025-12-14 18:44:45 +01:00 • committed by GitHub
commit c9f54cd60b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ifs/wl_surface.rs
View file

@ -1594,7 +1594,7 @@ impl WlSurface {
let ext = child.sub_surface.surface.extents.get(); let ext = child.sub_surface.surface.extents.get();
let ext = ext.move_(pos.0, pos.1); let ext = ext.move_(pos.0, pos.1);
if ext.contains(x, y) { if ext.contains(x, y) {
let (x, y) = ext.translate(x, y); let (x, y) = (x - pos.0, y - pos.1);
if let Some(res) = child.sub_surface.surface.find_surface_at(x, y) { if let Some(res) = child.sub_surface.surface.find_surface_at(x, y) {
return Some(res); return Some(res);
} }

2
src/ifs/wl_surface/wl_subsurface.rs
View file

@ -433,7 +433,7 @@ impl SurfaceExt for WlSubsurface {
} }
fn tray_item(self: Rc<Self>) -> Option<TrayItemId> { fn tray_item(self: Rc<Self>) -> Option<TrayItemId> {
self.surface.node_tray_item() self.parent.node_tray_item()
} }
} }