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

Merge pull request #318 from glennw/thread-wake-mac

Browse source 
Fix waking up mac event loop from thread.
This commit is contained in:
tomaka 2015-03-23 10:35:31 +01:00
parent fce9b40deb 918833b19f
commit a6485045f1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cocoa/mod.rs
View file

@ -30,7 +30,7 @@ use std::str::from_utf8;
use std::sync::Mutex; use std::sync::Mutex;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; use events::Event::{Awakened, MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel};
use events::ElementState::{Pressed, Released}; use events::ElementState::{Pressed, Released};
use events::MouseButton; use events::MouseButton;
use events; use events;
@ -333,6 +333,8 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
// calling poll_events() // calling poll_events()
if let Some(ev) = self.window.poll_events().next() { if let Some(ev) = self.window.poll_events().next() {
return Some(ev); return Some(ev);
} else {
return Some(Awakened);
} }
} }
} }