edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 09:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8784 from Robyt3/Android-Backbutton-Handling-Revert

Browse source 
Revert "Quit if Android back-button is pressed 3 times within 1 second"
This commit is contained in:
Jupeyy 2024-08-21 17:54:23 +00:00 committed by GitHub
parent 4dc7346b4f 499ad48ee6
commit fe9c2d305f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -712,35 +712,9 @@ int CInput::Update()
// handle keys
case SDL_KEYDOWN:
#if defined(CONF_PLATFORM_ANDROID)
if(Event.key.keysym.scancode == KEY_AC_BACK && m_BackButtonReleased)
{
if(m_LastBackPress == -1 || (Now - m_LastBackPress) / (float)time_freq() > 1.0f)
{
m_NumBackPresses = 1;
m_LastBackPress = Now;
}
else
{
m_NumBackPresses++;
if(m_NumBackPresses >= 3)
{
// Quit if the Android back-button was pressed 3 times within 1 second
return 1;
}
}
m_BackButtonReleased = false;
}
#endif
Scancode = TranslateScancode(Event.key);
break;
case SDL_KEYUP:
#if defined(CONF_PLATFORM_ANDROID)
if(Event.key.keysym.scancode == KEY_AC_BACK && !m_BackButtonReleased)
{
m_BackButtonReleased = true;
}
#endif
Action = IInput::FLAG_RELEASE;
Scancode = TranslateScancode(Event.key);
break;

5
src/engine/client/input.h
View file

@ -76,11 +76,6 @@ private:
bool m_InputGrabbed;
bool m_MouseFocus;
#if defined(CONF_PLATFORM_ANDROID)
int m_NumBackPresses = 0;
bool m_BackButtonReleased = true;
int64_t m_LastBackPress = -1;
#endif
// IME support
std::string m_CompositionString;