Merge pull request #688 from mahkoh/jorth/subsurface-tray-item-2
wl_subsurface: various fixes
This commit is contained in:
commit
c9f54cd60b
2 changed files with 2 additions and 2 deletions
|
|
@ -1594,7 +1594,7 @@ impl WlSurface {
|
|||
let ext = child.sub_surface.surface.extents.get();
|
||||
let ext = ext.move_(pos.0, pos.1);
|
||||
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) {
|
||||
return Some(res);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ impl SurfaceExt for WlSubsurface {
|
|||
}
|
||||
|
||||
fn tray_item(self: Rc<Self>) -> Option<TrayItemId> {
|
||||
self.surface.node_tray_item()
|
||||
self.parent.node_tray_item()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue