bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix hover when focus is different from hover window

Browse source 
Fixes #14
This commit is contained in:
Shawn Wallace 2024-06-30 02:44:55 -04:00
parent d3a46b7c8a
commit d8a9c28fa7
5 changed files with 94 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/server/event.rs
View file

@ -385,17 +385,23 @@ impl HandleEvent for Pointer {
ref surface,
surface_x,
surface_y,
} => {
let do_enter = || {
debug!("entering surface ({serial})");
if let Some(surface) = state.get_server_surface_from_client(surface.clone()) {
self.server.enter(serial, surface, surface_x, surface_y)
} else {
warn!("could not enter surface: stale surface");
}
};
} => 'enter: {
let surface_key: ObjectKey = surface.data().copied().unwrap();
let surface_data: &SurfaceData = state.objects[surface_key].as_ref();
let Some(surface_data): Option<&SurfaceData> =
state.objects.get(surface_key).map(|o| o.as_ref())
else {
warn!("could not enter surface: stale surface");
break 'enter;
};
let mut do_enter = || {
debug!("entering surface ({serial})");
self.server
.enter(serial, &surface_data.server, surface_x, surface_y);
let window = surface_data.window.unwrap();
state.connection.as_mut().unwrap().raise_to_top(window);
state.last_hovered = Some(window);
};
if matches!(surface_data.role, Some(SurfaceRole::Popup(_))) {
match self.pending_enter.0.take() {