archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GHOST: Fix processEvents not notifying events handled by the system if the window is hidden.

Browse Source 
Reviewed By: @LazyDodo
Differential Revision: https://developer.blender.org/D3154
This commit is contained in:
Germano Cavalcante
2018-04-19 11:26:33 -03:00
parent ffe02e17b2
commit 785e8a636a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@@ -396,12 +396,12 @@ GHOST_TSuccess GHOST_SystemWin32::disposeContext(GHOST_IContext *context)
bool GHOST_SystemWin32::processEvents(bool waitForEvent) bool GHOST_SystemWin32::processEvents(bool waitForEvent)
{ {
MSG msg; MSG msg;
bool anyProcessed = false; bool hasEventHandled = false;
do { do {
GHOST_TimerManager *timerMgr = getTimerManager(); GHOST_TimerManager *timerMgr = getTimerManager();
if (waitForEvent && !::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE)) { if (waitForEvent && !::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
#if 1 #if 1
::Sleep(1); ::Sleep(1);
#else #else
@@ -420,20 +420,26 @@ bool GHOST_SystemWin32::processEvents(bool waitForEvent)
} }
if (timerMgr->fireTimers(getMilliSeconds())) { if (timerMgr->fireTimers(getMilliSeconds())) {
anyProcessed = true; hasEventHandled = true;
} }
// Process all the events waiting for us // Process all the events waiting for us
while (::PeekMessageW(&msg, 0, 0, 0, PM_REMOVE) != 0) { while (::PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE) != 0) {
// TranslateMessage doesn't alter the message, and doesn't change our raw keyboard data. // TranslateMessage doesn't alter the message, and doesn't change our raw keyboard data.
// Needed for MapVirtualKey or if we ever need to get chars from wm_ime_char or similar. // Needed for MapVirtualKey or if we ever need to get chars from wm_ime_char or similar.
::TranslateMessage(&msg); ::TranslateMessage(&msg);
::DispatchMessageW(&msg); ::DispatchMessageW(&msg);
anyProcessed = true;
} }
} while (waitForEvent && !anyProcessed);
return anyProcessed; if (hasEventHandled == false) {
// Check if we have events handled by the system
// (for example the `GHOST_kEventWindowClose`).
hasEventHandled = m_eventManager->getNumEvents() != 0;
}
} while (waitForEvent && !hasEventHandled);
return hasEventHandled;
} }