From 78a3cb568938fdc563efbd43eccbcbc7d7a05c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Jun 2024 23:30:22 +0200 Subject: [PATCH] Fix for non-app-store builds --- ios/ViewController.mm | 5 +++++ ios/ViewControllerMetal.mm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ios/ViewController.mm b/ios/ViewController.mm index f6a8dda7e7..765dc9f563 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -499,6 +499,9 @@ void GLRenderLoop(IOSGLESContext *graphicsContext) { 0 /* bearing */); } +// See PPSSPPUIApplication.mm for the other method +#if PPSSPP_PLATFORM(IOS_APP_STORE) + - (void)pressesBegan:(NSSet *)presses withEvent:(UIPressesEvent *)event { KeyboardPressesBegan(presses, event); } @@ -511,6 +514,8 @@ void GLRenderLoop(IOSGLESContext *graphicsContext) { KeyboardPressesEnded(presses, event); } +#endif + // The below is inspired by https://stackoverflow.com/questions/7253477/how-to-display-the-iphone-ipad-keyboard-over-a-full-screen-opengl-es-app // It's a bit limited but good enough. diff --git a/ios/ViewControllerMetal.mm b/ios/ViewControllerMetal.mm index 9bbfd3fc9c..d57e20ba6f 100644 --- a/ios/ViewControllerMetal.mm +++ b/ios/ViewControllerMetal.mm @@ -571,6 +571,9 @@ extern float g_safeInsetBottom; g_iCadeTracker.ButtonUp(button); } +// See PPSSPPUIApplication.mm for the other method +#if PPSSPP_PLATFORM(IOS_APP_STORE) + - (void)pressesBegan:(NSSet *)presses withEvent:(UIPressesEvent *)event { KeyboardPressesBegan(presses, event); } @@ -583,6 +586,8 @@ extern float g_safeInsetBottom; KeyboardPressesEnded(presses, event); } +#endif + - (void)controllerDidConnect:(NSNotification *)note { if (![[GCController controllers] containsObject:self.gameController]) self.gameController = nil;