From 3b1fdc0f55e5040667db40846b79783e017604fc Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Mon, 16 Jan 2017 14:35:34 -0500 Subject: [PATCH] macos: Map our user generated event to Event::Awakened This fixes propagation of Event::Awakend from wakeup_event_loop() when using poll_event() on macOS. Currently wait_event() translates all unknown events into Event::Awakened so doesn't need the explicit translation. --- src/platform/macos/mod.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/platform/macos/mod.rs b/src/platform/macos/mod.rs index 299f9c3e..b315d1da 100644 --- a/src/platform/macos/mod.rs +++ b/src/platform/macos/mod.rs @@ -822,6 +822,12 @@ unsafe fn NSEventToEvent(window: &Window, nsevent: id) -> Option { appkit::NSEventTypePressure => { Some(Event::TouchpadPressure(nsevent.pressure(), nsevent.stage())) }, + appkit::NSApplicationDefined => { + match nsevent.subtype() { + appkit::NSEventSubtype::NSApplicationActivatedEventType => { Some(Event::Awakened) } + _ => { None } + } + }, _ => { None }, } }