alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 13:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

x11/wayland: Don't reset control flow between loop ticks (#916)

Browse source
This commit is contained in:
Victor Berger 2019-06-13 18:52:10 +02:00 committed by Osspial
parent 412516159f
commit 9a11f90a02
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/platform_impl/linux/wayland/event_loop.rs
View file

@ -249,12 +249,10 @@ impl<T: 'static> EventLoop<T> {
ControlFlow::Poll => { ControlFlow::Poll => {
// non-blocking dispatch // non-blocking dispatch
self.inner_loop.dispatch(Some(::std::time::Duration::from_millis(0)), &mut ()).unwrap(); self.inner_loop.dispatch(Some(::std::time::Duration::from_millis(0)), &mut ()).unwrap();
control_flow = ControlFlow::default();
callback(::event::Event::NewEvents(::event::StartCause::Poll), &self.window_target, &mut control_flow); callback(::event::Event::NewEvents(::event::StartCause::Poll), &self.window_target, &mut control_flow);
}, },
ControlFlow::Wait => { ControlFlow::Wait => {
self.inner_loop.dispatch(None, &mut ()).unwrap(); self.inner_loop.dispatch(None, &mut ()).unwrap();
control_flow = ControlFlow::default();
callback( callback(
::event::Event::NewEvents(::event::StartCause::WaitCancelled { ::event::Event::NewEvents(::event::StartCause::WaitCancelled {
start: Instant::now(), start: Instant::now(),
@ -273,7 +271,6 @@ impl<T: 'static> EventLoop<T> {
::std::time::Duration::from_millis(0) ::std::time::Duration::from_millis(0)
}; };
self.inner_loop.dispatch(Some(duration), &mut ()).unwrap(); self.inner_loop.dispatch(Some(duration), &mut ()).unwrap();
control_flow = ControlFlow::default();
let now = Instant::now(); let now = Instant::now();
if now < deadline { if now < deadline {
callback( callback(

3
src/platform_impl/linux/x11/mod.rs
View file

@ -283,12 +283,10 @@ impl<T: 'static> EventLoop<T> {
ControlFlow::Poll => { ControlFlow::Poll => {
// non-blocking dispatch // non-blocking dispatch
self.inner_loop.dispatch(Some(::std::time::Duration::from_millis(0)), &mut ()).unwrap(); self.inner_loop.dispatch(Some(::std::time::Duration::from_millis(0)), &mut ()).unwrap();
control_flow = ControlFlow::default();
callback(::event::Event::NewEvents(::event::StartCause::Poll), &self.target, &mut control_flow); callback(::event::Event::NewEvents(::event::StartCause::Poll), &self.target, &mut control_flow);
}, },
ControlFlow::Wait => { ControlFlow::Wait => {
self.inner_loop.dispatch(None, &mut ()).unwrap(); self.inner_loop.dispatch(None, &mut ()).unwrap();
control_flow = ControlFlow::default();
callback( callback(
::event::Event::NewEvents(::event::StartCause::WaitCancelled { ::event::Event::NewEvents(::event::StartCause::WaitCancelled {
start: ::std::time::Instant::now(), start: ::std::time::Instant::now(),
@ -307,7 +305,6 @@ impl<T: 'static> EventLoop<T> {
::std::time::Duration::from_millis(0) ::std::time::Duration::from_millis(0)
}; };
self.inner_loop.dispatch(Some(duration), &mut ()).unwrap(); self.inner_loop.dispatch(Some(duration), &mut ()).unwrap();
control_flow = ControlFlow::default();
let now = std::time::Instant::now(); let now = std::time::Instant::now();
if now < deadline { if now < deadline {
callback( callback(