Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #19281 from hrydgard/disable-swipe-ingame

Browse Source 
iOS: Disable the swipe-back gesture in-game, to maximize touch responsiveness
This commit is contained in:
Henrik Rydgård 2024-06-20 09:20:57 +02:00 committed by GitHub
commit f9d4cd23c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Render/Text/draw_text_cocoa.mm
View File

@ -125,6 +125,8 @@ void TextDrawerCocoa::MeasureString(std::string_view str, float *w, float *h) {
if (iter != sizeCache_.end()) {
entry = iter->second.get();
} else {
// INFO_LOG(SYSTEM, "Measuring %.*s", (int)str.length(), str.data());
auto iter = fontMap_.find(fontHash_);
NSDictionary *attributes = nil;
if (iter != fontMap_.end()) {

30
ios/ViewController.mm
View File

@ -113,7 +113,9 @@ id<PPSSPPViewController> sharedViewController;
@end
@implementation PPSSPPViewControllerGL
@implementation PPSSPPViewControllerGL {
UIScreenEdgePanGestureRecognizer *mBackGestureRecognizer;
}
-(id) init {
self = [super init];
@ -219,7 +221,9 @@ void GLRenderLoop(IOSGLESContext *graphicsContext) {
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
INFO_LOG(G3D, "viewDidAppear");
[self hideKeyboard];
[self updateGesture];
}
- (void)viewDidLoad {
@ -269,10 +273,6 @@ void GLRenderLoop(IOSGLESContext *graphicsContext) {
[self hideKeyboard];
UIScreenEdgePanGestureRecognizer *mBackGestureRecognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:) ];
[mBackGestureRecognizer setEdges:UIRectEdgeLeft];
[[self view] addGestureRecognizer:mBackGestureRecognizer];
// Initialize the motion manager for accelerometer control.
self.motionManager = [[CMMotionManager alloc] init];
INFO_LOG(G3D, "Done with viewDidLoad.");
@ -447,7 +447,7 @@ void GLRenderLoop(IOSGLESContext *graphicsContext) {
} else {
INFO_LOG(SYSTEM, "Allow system gestures on the bottom");
// Allow task switching gestures to take precedence, without causing
// scroll events in the UI.
// scroll events in the UI. Otherwise, we get "ghost" scrolls when switching tasks.
return UIRectEdgeTop | UIRectEdgeLeft | UIRectEdgeRight;
}
}
@ -456,6 +456,24 @@ void GLRenderLoop(IOSGLESContext *graphicsContext) {
{
[self setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
[self hideKeyboard];
[self updateGesture];
}
- (void)updateGesture {
INFO_LOG(SYSTEM, "Updating swipe gesture.");
if (mBackGestureRecognizer) {
INFO_LOG(SYSTEM, "Removing swipe gesture.");
[[self view] removeGestureRecognizer:mBackGestureRecognizer];
mBackGestureRecognizer = nil;
}
if (GetUIState() != UISTATE_INGAME) {
INFO_LOG(SYSTEM, "Adding swipe gesture.");
mBackGestureRecognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:) ];
[mBackGestureRecognizer setEdges:UIRectEdgeLeft];
[[self view] addGestureRecognizer:mBackGestureRecognizer];
}
}
- (UIView *)getView {

30
ios/ViewControllerMetal.mm
View File

@ -217,7 +217,9 @@ static std::thread g_renderLoopThread;
@end // @interface
@implementation PPSSPPViewControllerMetal
@implementation PPSSPPViewControllerMetal {
UIScreenEdgePanGestureRecognizer *mBackGestureRecognizer;
}
- (id)init {
self = [super init];
@ -440,10 +442,6 @@ void VulkanRenderLoop(IOSVulkanContext *graphicsContext, CAMetalLayer *metalLaye
locationHelper = [[LocationHelper alloc] init];
[locationHelper setDelegate:self];
UIScreenEdgePanGestureRecognizer *mBackGestureRecognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:) ];
[mBackGestureRecognizer setEdges:UIRectEdgeLeft];
[[self view] addGestureRecognizer:mBackGestureRecognizer];
// Initialize the motion manager for accelerometer control.
self.motionManager = [[CMMotionManager alloc] init];
}
@ -478,7 +476,8 @@ void VulkanRenderLoop(IOSVulkanContext *graphicsContext, CAMetalLayer *metalLaye
[super viewDidAppear:animated];
INFO_LOG(G3D, "viewDidAppear");
[self hideKeyboard];
INFO_LOG(G3D, "viewDidAppearDone");
[self updateGesture];
}
- (BOOL)prefersHomeIndicatorAutoHidden {
@ -529,6 +528,25 @@ extern float g_safeInsetBottom;
{
[self setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
[self hideKeyboard];
[self updateGesture];
}
- (void)updateGesture {
INFO_LOG(SYSTEM, "Updating swipe gesture.");
if (mBackGestureRecognizer) {
INFO_LOG(SYSTEM, "Removing swipe gesture.");
[[self view] removeGestureRecognizer:mBackGestureRecognizer];
mBackGestureRecognizer = nil;
}
if (GetUIState() != UISTATE_INGAME) {
INFO_LOG(SYSTEM, "Adding swipe gesture.");
mBackGestureRecognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipeFrom:) ];
[mBackGestureRecognizer setEdges:UIRectEdgeLeft];
[[self view] addGestureRecognizer:mBackGestureRecognizer];
}
}
- (void)bindDefaultFBO