From 037927b9beaa120053083c095d5987fe13deaabc Mon Sep 17 00:00:00 2001
From: redphx <96280+redphx@users.noreply.github.com>
Date: Fri, 20 Sep 2024 07:05:39 +0700
Subject: [PATCH] Fix not able to control Remote Play dialog using controller
 (#509)

---
 dist/better-xcloud.user.js                  | 9 +++++----
 src/modules/ui/dialog/navigation-dialog.ts  | 2 +-
 src/modules/ui/dialog/remote-play-dialog.ts | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dist/better-xcloud.user.js b/dist/better-xcloud.user.js
index 17d9c03..c6d328c 100644
--- a/dist/better-xcloud.user.js
+++ b/dist/better-xcloud.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      5.7.4
+// @version      5.7.5-beta
 // @description  Improve Xbox Cloud Gaming (xCloud) experience
 // @author       redphx
 // @license      MIT
@@ -139,7 +139,7 @@ function deepClone(obj) {
     return {};
   return JSON.parse(JSON.stringify(obj));
 }
-var SCRIPT_VERSION = "5.7.4", AppInterface = window.AppInterface;
+var SCRIPT_VERSION = "5.7.5-beta", AppInterface = window.AppInterface;
 UserAgent.init();
 var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.includes("smart-tv") || userAgent.includes("smarttv") || /\baft.*\b/.test(userAgent), isVr = window.navigator.userAgent.includes("VR") && window.navigator.userAgent.includes("OculusBrowser"), browserHasTouchSupport = "ontouchstart" in window || navigator.maxTouchPoints > 0, userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport, STATES = {
   supportedRegion: !0,
@@ -2507,7 +2507,7 @@ class NavigationDialog {
     return !1;
   }
   handleGamepad(button) {
-    return !0;
+    return !1;
   }
 }
 
@@ -6236,7 +6236,8 @@ class RemotePlayNavigationDialog extends NavigationDialog {
       label: t("help")
     }), createButton({
       style: 4 | 32,
-      label: t("close")
+      label: t("close"),
+      onClick: (e) => this.hide()
     }))), this.$container = $fragment;
   }
   getDialog() {
diff --git a/src/modules/ui/dialog/navigation-dialog.ts b/src/modules/ui/dialog/navigation-dialog.ts
index 6f74338..016dfd2 100644
--- a/src/modules/ui/dialog/navigation-dialog.ts
+++ b/src/modules/ui/dialog/navigation-dialog.ts
@@ -80,7 +80,7 @@ export abstract class NavigationDialog {
     }
 
     handleGamepad(button: GamepadKey): boolean {
-        return true;
+        return false;
     }
 }
 
diff --git a/src/modules/ui/dialog/remote-play-dialog.ts b/src/modules/ui/dialog/remote-play-dialog.ts
index ddd2267..83ef16b 100644
--- a/src/modules/ui/dialog/remote-play-dialog.ts
+++ b/src/modules/ui/dialog/remote-play-dialog.ts
@@ -125,6 +125,7 @@ export class RemotePlayNavigationDialog extends NavigationDialog {
                 createButton({
                     style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE,
                     label: t('close'),
+                    onClick: e => this.hide(),
                 }),
             ),
         );