alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 14:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #578 from vberger/master

Browse source 
Minor fixes to wayland backend
This commit is contained in:
tomaka 2015-08-21 19:27:58 +02:00
parent 73e4a7d4b1 f3e67128db
commit 506c4ed6ea
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/api/wayland/context.rs
View file

@ -86,7 +86,7 @@ impl WaylandContext {
if let Some(sid) = sid { if let Some(sid) = sid {
let map = event_queues.lock().unwrap(); let map = event_queues.lock().unwrap();
if let Some(queue) = map.get(&sid) { if let Some(queue) = map.get(&sid) {
queue.lock().unwrap().push_back(Event::Moved(x as i32,y as i32)) queue.lock().unwrap().push_back(Event::MouseMoved((x as i32,y as i32)))
} }
} }
}); });
@ -218,4 +218,11 @@ impl WaylandContext {
p.lock().unwrap().remove_handled_surface(sid); p.lock().unwrap().remove_handled_surface(sid);
} }
} }
pub fn push_event_for(&self, sid: SurfaceId, evt: Event) {
let mut guard = self.windows_event_queues.lock().unwrap();
if let Some(queue) = guard.get(&sid) {
queue.lock().unwrap().push_back(evt);
}
}
} }

7
src/api/wayland/mod.rs
View file

@ -134,6 +134,13 @@ impl Window {
if let Some(f) = self.resize_callback { if let Some(f) = self.resize_callback {
f(w as u32, h as u32); f(w as u32, h as u32);
} }
if let Some(ref ctxt) = *WAYLAND_CONTEXT {
let mut window_guard = self.shell_window.lock().unwrap();
ctxt.push_event_for(
window_guard.get_shell().get_wsurface().get_id(),
Event::Resized(w as u32, h as u32)
);
}
} }
b b
} }