From a8a33cf3c4136c08cfc81e6d20e4f3351c8f14fb Mon Sep 17 00:00:00 2001
From: Eric Warmenhoven <eric@warmenhoven.org>
Date: Thu, 14 Sep 2023 12:10:49 -0400
Subject: [PATCH] Fix accidental left/right keypresses on tvOS (#15696)

---
 ui/drivers/cocoa/cocoa_common.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index f497e5d8a7..f43fbe3744 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -157,10 +157,14 @@ void *glkitview_init(void);
                               || controller.extendedGamepad.rightThumbstick.down.pressed;
             else if (type == UIPressTypeLeftArrow)
                 extendedPress |= controller.extendedGamepad.dpad.left.pressed
+                              || controller.extendedGamepad.leftShoulder.pressed
+                              || controller.extendedGamepad.leftTrigger.pressed
                               || controller.extendedGamepad.leftThumbstick.left.pressed
                               || controller.extendedGamepad.rightThumbstick.left.pressed;
             else if (type == UIPressTypeRightArrow)
                 extendedPress |= controller.extendedGamepad.dpad.right.pressed
+                              || controller.extendedGamepad.rightShoulder.pressed
+                              || controller.extendedGamepad.rightTrigger.pressed
                               || controller.extendedGamepad.leftThumbstick.right.pressed
                               || controller.extendedGamepad.rightThumbstick.right.pressed;
             else if (type == UIPressTypeSelect)