mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-24 00:15:40 +00:00
WinRT: fixed bug: Back button(s) weren't working on Win10
Many thanks go to Sylvain Becker for providing details on the fix!
This commit is contained in:
parent
d1e6a2ebe6
commit
f2f435ee45
|
@ -364,7 +364,10 @@ void SDL_WinRTApp::SetWindow(CoreWindow^ window)
|
||||||
window->CharacterReceived +=
|
window->CharacterReceived +=
|
||||||
ref new TypedEventHandler<CoreWindow^, CharacterReceivedEventArgs^>(this, &SDL_WinRTApp::OnCharacterReceived);
|
ref new TypedEventHandler<CoreWindow^, CharacterReceivedEventArgs^>(this, &SDL_WinRTApp::OnCharacterReceived);
|
||||||
|
|
||||||
#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
#if NTDDI_VERSION >= NTDDI_WIN10
|
||||||
|
Windows::UI::Core::SystemNavigationManager::GetForCurrentView()->BackRequested +=
|
||||||
|
ref new EventHandler<BackRequestedEventArgs^>(this, &SDL_WinRTApp::OnBackButtonPressed);
|
||||||
|
#elif WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
||||||
HardwareButtons::BackPressed +=
|
HardwareButtons::BackPressed +=
|
||||||
ref new EventHandler<BackPressedEventArgs^>(this, &SDL_WinRTApp::OnBackButtonPressed);
|
ref new EventHandler<BackPressedEventArgs^>(this, &SDL_WinRTApp::OnBackButtonPressed);
|
||||||
#endif
|
#endif
|
||||||
|
@ -785,8 +788,8 @@ void SDL_WinRTApp::OnCharacterReceived(Windows::UI::Core::CoreWindow^ sender, Wi
|
||||||
WINRT_ProcessCharacterReceivedEvent(args);
|
WINRT_ProcessCharacterReceivedEvent(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
template <typename BackButtonEventArgs>
|
||||||
void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args)
|
static void WINRT_OnBackButtonPressed(BackButtonEventArgs ^ args)
|
||||||
{
|
{
|
||||||
SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_AC_BACK);
|
SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_AC_BACK);
|
||||||
SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_AC_BACK);
|
SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_AC_BACK);
|
||||||
|
@ -798,5 +801,18 @@ void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if NTDDI_VERSION == NTDDI_WIN10
|
||||||
|
void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args)
|
||||||
|
|
||||||
|
{
|
||||||
|
WINRT_OnBackButtonPressed(args);
|
||||||
|
}
|
||||||
|
#elif WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
||||||
|
void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args)
|
||||||
|
|
||||||
|
{
|
||||||
|
WINRT_OnBackButtonPressed(args);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,9 @@ protected:
|
||||||
void OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
|
void OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
|
||||||
void OnCharacterReceived(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CharacterReceivedEventArgs^ args);
|
void OnCharacterReceived(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CharacterReceivedEventArgs^ args);
|
||||||
|
|
||||||
#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
#if NTDDI_VERSION >= NTDDI_WIN10
|
||||||
|
void OnBackButtonPressed(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args);
|
||||||
|
#elif WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
||||||
void OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args);
|
void OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue