Skip to content
Snippets Groups Projects
Commit 85b502b7 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix minimizing in SDL window backend

parent aea943ba
No related branches found
No related tags found
No related merge requests found
...@@ -264,8 +264,6 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks, ...@@ -264,8 +264,6 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
mOverrideAspectRatio = 0.f; mOverrideAspectRatio = 0.f;
mGrabbyKeyFlags = 0; mGrabbyKeyFlags = 0;
mReallyCapturedCount = 0; mReallyCapturedCount = 0;
mHaveInputFocus = -1;
mIsMinimized = -1;
mFSAASamples = fsaa_samples; mFSAASamples = fsaa_samples;
mPreeditor = nullptr; mPreeditor = nullptr;
mLanguageTextInputAllowed = false; mLanguageTextInputAllowed = false;
...@@ -2020,23 +2018,23 @@ void LLWindowSDL::gatherInput() ...@@ -2020,23 +2018,23 @@ void LLWindowSDL::gatherInput()
case SDL_WINDOWEVENT_MAXIMIZED: case SDL_WINDOWEVENT_MAXIMIZED:
[[fallthrough]]; [[fallthrough]];
case SDL_WINDOWEVENT_RESTORED: case SDL_WINDOWEVENT_RESTORED:
mIsMinimized = (event.window.event == SDL_WINDOWEVENT_MINIMIZED); {
Uint32 flags = SDL_GetWindowFlags(mWindow);
bool minimized = (flags & SDL_WINDOW_MINIMIZED);
mCallbacks->handleActivate(this, !mIsMinimized); mCallbacks->handleActivate(this, !minimized);
LL_INFOS() << "SDL deiconification state switched to " << mIsMinimized << LL_ENDL; LL_INFOS() << "SDL deiconification state switched to " << minimized << LL_ENDL;
break; break;
}
case SDL_WINDOWEVENT_ENTER: case SDL_WINDOWEVENT_ENTER:
break; break;
case SDL_WINDOWEVENT_LEAVE: case SDL_WINDOWEVENT_LEAVE:
mCallbacks->handleMouseLeave(this); mCallbacks->handleMouseLeave(this);
break; break;
case SDL_WINDOWEVENT_FOCUS_GAINED: case SDL_WINDOWEVENT_FOCUS_GAINED:
mHaveInputFocus = true;
mCallbacks->handleFocus(this); mCallbacks->handleFocus(this);
break; break;
case SDL_WINDOWEVENT_FOCUS_LOST: case SDL_WINDOWEVENT_FOCUS_LOST:
mHaveInputFocus = false;
mCallbacks->handleFocusLost(this); mCallbacks->handleFocusLost(this);
break; break;
case SDL_WINDOWEVENT_CLOSE: case SDL_WINDOWEVENT_CLOSE:
......
...@@ -204,8 +204,6 @@ class LLWindowSDL final : public LLWindow ...@@ -204,8 +204,6 @@ class LLWindowSDL final : public LLWindow
int mSDLFlags; int mSDLFlags;
SDL_Cursor* mSDLCursors[UI_CURSOR_COUNT]; SDL_Cursor* mSDLCursors[UI_CURSOR_COUNT];
int mHaveInputFocus; /* 0=no, 1=yes, else unknown */
int mIsMinimized; /* 0=no, 1=yes, else unknown */
friend class LLWindowManager; friend class LLWindowManager;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment