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

server: raise windows to top on touch

Browse source
This commit is contained in:
Shawn Wallace 2025-11-28 16:52:16 -05:00
parent c7d96d52f5
commit b362a38737
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/server/event.rs
View file

@ -934,16 +934,20 @@ impl Event for client::wl_touch::Event {
} => { } => {
let mut cmd = CommandBuffer::new(); let mut cmd = CommandBuffer::new();
{ {
let connection = &mut state.connection;
let world = &mut state.inner.world;
let s_entity = surface.data().copied(); let s_entity = surface.data().copied();
let mut s_query = s_entity.and_then(|key| { let mut s_query = s_entity.and_then(|key| {
state world
.world .query_one::<(&WlSurface, &SurfaceScaleFactor, &x::Window)>(key)
.query_one::<(&WlSurface, &SurfaceScaleFactor)>(key)
.ok() .ok()
}); });
if let Some((s_surface, s_factor)) = s_query.as_mut().and_then(|q| q.get()) { if let Some((s_surface, s_factor, window)) =
s_query.as_mut().and_then(|q| q.get())
{
cmd.insert_one(target, *s_factor); cmd.insert_one(target, *s_factor);
let touch = state.world.get::<&WlTouch>(target).unwrap(); connection.raise_to_top(*window);
let touch = world.get::<&WlTouch>(target).unwrap();
touch.down(serial, time, s_surface, id, x * s_factor.0, y * s_factor.0); touch.down(serial, time, s_surface, id, x * s_factor.0, y * s_factor.0);
} else if let Some(&DecorationMarker { parent }) = surface.data() { } else if let Some(&DecorationMarker { parent }) = surface.data() {
drop(s_query); drop(s_query);