edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6532

Browse source 
6532: Fix input as the comments suggest for the next SDL version r=def- a=Jupeyy

Since we want to upgrade SDL version.

SDL fixed the bug on Windows that releasing the mouse while tabbing out directly refocuses the window, which broke desktop fullscreen (and maybe windowed fullscreen)

<!-- What is the motivation for the changes of this pull request? -->

<!-- Note that builds and other checks will be run for your change. Don't feel intimidated by failures in some of the checks. If you can't resolve them yourself, experienced devs can also resolve them before merging your pull request. -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2023-04-25 20:10:25 +00:00 committed by GitHub
parent 181d831411 7fa14139d8
commit fcee2fa6a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/input.cpp
View file

@ -720,8 +720,7 @@ int CInput::Update()
case SDL_WINDOWEVENT_FOCUS_GAINED: case SDL_WINDOWEVENT_FOCUS_GAINED:
if(m_InputGrabbed) if(m_InputGrabbed)
{ {
// Enable this in case SDL 2.0.16 has major bugs or 2.0.18 still doesn't fix tabbing out with relative mouse MouseModeRelative();
// MouseModeRelative();
// Clear pending relative mouse motion // Clear pending relative mouse motion
SDL_GetRelativeMouseState(nullptr, nullptr); SDL_GetRelativeMouseState(nullptr, nullptr);
} }
@ -733,8 +732,7 @@ int CInput::Update()
IgnoreKeys = true; IgnoreKeys = true;
if(m_InputGrabbed) if(m_InputGrabbed)
{ {
// Enable this in case SDL 2.0.16 has major bugs or 2.0.18 still doesn't fix tabbing out with relative mouse MouseModeAbsolute();
// MouseModeAbsolute();
// Remember that we had relative mouse // Remember that we had relative mouse
m_InputGrabbed = true; m_InputGrabbed = true;
} }