@@ -346,31 +346,41 @@ void CRenderDevice::message_loop()
346
346
switch (event.window .event )
347
347
{
348
348
case SDL_WINDOWEVENT_MOVED:
349
- case SDL_WINDOWEVENT_SIZE_CHANGED:
350
- case SDL_WINDOWEVENT_MAXIMIZED:
351
349
SDL_Log (" Window %d moved to %d,%d" , event.window .windowID , event.window .data1 , event.window .data2 );
352
350
continue ;
351
+ case SDL_WINDOWEVENT_SIZE_CHANGED:
352
+ SDL_Log (" Window %d resized to %d,%d" , event.window .windowID , event.window .data1 , event.window .data2 );
353
+ continue ;
353
354
case SDL_WINDOWEVENT_CLOSE:
354
355
event.type = SDL_QUIT;
355
356
SDL_PeepEvents (&event, 1 , SDL_ADDEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
356
357
continue ;
357
358
#if SDL_VERSION_ATLEAST(2, 0, 5)
358
359
case SDL_WINDOWEVENT_SHOWN:
359
- case SDL_WINDOWEVENT_EXPOSED:
360
- // case SDL_WINDOWEVENT_TAKE_FOCUS:
360
+ case SDL_WINDOWEVENT_FOCUS_GAINED:
361
361
if (editor ())
362
362
{
363
363
Device.b_is_Active = TRUE ;
364
364
continue ;
365
365
}
366
- OnWM_Activate (event. window . data1 , event.window .data2 );
366
+ OnWM_Activate (1 , event.window .data2 );
367
367
SDL_Log (" Window %d is offered a focus" , event.window .windowID );
368
368
continue ;
369
+ case SDL_WINDOWEVENT_HIDDEN:
370
+ case SDL_WINDOWEVENT_FOCUS_LOST:
371
+ OnWM_Activate (0 , event.window .data2 );
372
+ SDL_Log (" Window %d is lost a focus" , event.window .windowID );
373
+ continue ;
369
374
#endif
370
- default : SDL_Log (" Window %d got unknown event %d" , event.window .windowID , event.window .event ); continue ;
375
+ default :
376
+ SDL_Log (" Window %d got unknown event %d with %d %d" , event.window .windowID , event.window .event ,
377
+ event.window .data1 , event.window .data2 );
378
+ continue ;
371
379
}
372
380
continue ;
373
- default : Log (" Recieve window %d event" , event.type ); continue ;
381
+ default :
382
+ SDL_Log (" Window event %d to %d,%d" , event.type , event.window .data1 , event.window .data2 );
383
+ continue ;
374
384
}
375
385
}
376
386
@@ -528,10 +538,8 @@ void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason)
528
538
BOOL CRenderDevice::Paused () { return g_pauseMngr ().Paused (); }
529
539
void CRenderDevice::OnWM_Activate (WPARAM wParam, LPARAM /* lParam*/ )
530
540
{
531
- u16 fActive = LOWORD (wParam);
532
- const BOOL fMinimized = (BOOL)HIWORD (wParam);
541
+ const BOOL isWndActive = (1 == wParam) ? TRUE : FALSE ;
533
542
534
- const BOOL isWndActive = (fActive != WA_INACTIVE && (!fMinimized )) ? TRUE : FALSE ;
535
543
if (!editor () && !GEnv.isDedicatedServer && isWndActive)
536
544
pInput->ClipCursor (true );
537
545
else
0 commit comments