Przeglądaj źródła

Merge pull request #1846 from CouleeApps/background-fix

Fix SDL/Mac report going into the background
Areloch 8 lat temu
rodzic
commit
de1f002adc

+ 0 - 4
Engine/source/app/mainLoop.cpp

@@ -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
       {
       {

+ 1 - 1
Engine/source/windowManager/sdl/sdlWindow.cpp

@@ -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()