diff options
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 13 | 
1 files changed, 10 insertions, 3 deletions
| diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index e41aa9820f..da2222ad51 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -63,6 +63,9 @@ extern BOOL gDebugWindowProc;  const S32 MAX_NUM_RESOLUTIONS = 200; +const S32 MIN_WINDOW_WIDTH = 1024; +const S32 MIN_WINDOW_HEIGHT = 768; +  // static variable for ATI mouse cursor crash work-around:  static bool ATIbug = false;  @@ -1843,11 +1846,15 @@ void LLWindowSDL::gatherInput()                  break;              case SDL_VIDEORESIZE:  // *FIX: handle this? +            {  		llinfos << "Handling a resize event: " << event.resize.w <<  			"x" << event.resize.h << llendl; +		S32 width = llmax(event.resize.w, MIN_WINDOW_WIDTH); +		S32 height = llmax(event.resize.h, MIN_WINDOW_HEIGHT); +  		// *FIX: I'm not sure this is necessary! -		mWindow = SDL_SetVideoMode(event.resize.w, event.resize.h, 32, mSDLFlags); +		mWindow = SDL_SetVideoMode(width, height, 32, mSDLFlags);  		if (!mWindow)  		{  			// *FIX: More informative dialog? @@ -1861,9 +1868,9 @@ void LLWindowSDL::gatherInput()                  break;  		} -		mCallbacks->handleResize(this, event.resize.w, event.resize.h ); +		mCallbacks->handleResize(this, width, height);                  break; - +            }              case SDL_ACTIVEEVENT:                  if (event.active.state & SDL_APPINPUTFOCUS)                  { | 
