TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1846 from CouleeApps/background-fix

Browse source 
Fix SDL/Mac report going into the background
This commit is contained in:
Areloch 2016-12-05 09:06:14 -06:00 • committed by GitHub
commit de1f002adc
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/app/mainLoop.cpp
View file

@ -604,15 +604,11 @@ bool StandardMainLoop::doMainLoop()
lastFocus = newFocus; lastFocus = newFocus;
} }
#ifndef TORQUE_OS_MAC
// under the web plugin do not sleep the process when the child window loses focus as this will cripple the browser perfomance // under the web plugin do not sleep the process when the child window loses focus as this will cripple the browser perfomance
if (!Platform::getWebDeployment()) if (!Platform::getWebDeployment())
tm->setBackground(!newFocus); tm->setBackground(!newFocus);
else else
tm->setBackground(false); tm->setBackground(false);
#else
tm->setBackground(false);
#endif
} }
else else
{ {

2
Engine/source/windowManager/sdl/sdlWindow.cpp
View file

@ -342,7 +342,7 @@ bool PlatformWindowSDL::isFocused()
if( flags & SDL_WINDOW_INPUT_FOCUS || flags & SDL_WINDOW_INPUT_GRABBED || flags & SDL_WINDOW_MOUSE_FOCUS ) if( flags & SDL_WINDOW_INPUT_FOCUS || flags & SDL_WINDOW_INPUT_GRABBED || flags & SDL_WINDOW_MOUSE_FOCUS )
return true; return true;
return true; return false;
} }
bool PlatformWindowSDL::isMinimized() bool PlatformWindowSDL::isMinimized()