From aedc617298451dd484bcb58104784d1307c4ab19 Mon Sep 17 00:00:00 2001
From: redphx <96280+redphx@users.noreply.github.com>
Date: Sat, 13 Apr 2024 16:41:08 +0700
Subject: [PATCH] Fix screenshot button blocking Guide UI

---
 better-xcloud.user.js | 51 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/better-xcloud.user.js b/better-xcloud.user.js
index 07f4448..efb7831 100644
--- a/better-xcloud.user.js
+++ b/better-xcloud.user.js
@@ -3487,7 +3487,30 @@ var GAME_XBOX_TITLE_ID;
 var GAME_PRODUCT_ID;
 var APP_CONTEXT;
 
-window.BX_EXPOSED = {};
+window.BX_EXPOSED = {
+    onPollingModeChanged: mode => {
+        if (!IS_PLAYING) {
+            return false;
+        }
+
+        const $screenshotBtn = document.querySelector('.bx-screenshot-button');
+        const $touchControllerBar = document.getElementById('bx-touch-controller-bar');
+
+        if (mode !== 'None') {
+            // Hide screenshot button
+            $screenshotBtn && $screenshotBtn.classList.add('bx-gone');
+
+            // Hide touch controller bar
+            $touchControllerBar && $touchControllerBar.classList.add('bx-gone');
+        } else {
+            // Show screenshot button
+            $screenshotBtn && $screenshotBtn.classList.remove('bx-gone');
+
+            // Show touch controller bar
+            $touchControllerBar && $touchControllerBar.classList.remove('bx-gone');
+        }
+    },
+};
 
 let IS_REMOTE_PLAYING;
 let REMOTE_PLAY_CONFIG;
@@ -8307,6 +8330,19 @@ if (gamepadFound) {
             }
             return funcStr;
         },
+
+        broadcastPollingMode: function(funcStr) {
+            const text = '.setPollingMode=e=>{';
+            if (!funcStr.includes(text)) {
+                return false;
+            }
+
+            const newCode = `
+window.BX_EXPOSED.onPollingModeChanged && window.BX_EXPOSED.onPollingModeChanged(e);
+`;
+            funcStr = funcStr.replace(text, text + newCode);
+            return funcStr;
+        },
     };
 
     static #PATCH_ORDERS = [
@@ -8315,10 +8351,10 @@ if (gamepadFound) {
             'disableTelemetry',
         ],
 
-        getPref(Preferences.BLOCK_TRACKING) && ['disableTelemetryProvider'],
-
         ['disableStreamGate'],
 
+        ['broadcastPollingMode'],
+
         getPref(Preferences.UI_LAYOUT) === 'tv' && ['tvLayout'],
 
         BX_FLAGS.EnableXcloudLogging && [
@@ -8331,6 +8367,10 @@ if (gamepadFound) {
         getPref(Preferences.BLOCK_TRACKING) && [
             'blockWebRtcStatsCollector',
             'disableIndexDbLogging',
+        ],
+
+        getPref(Preferences.BLOCK_TRACKING) && [
+            'disableTelemetryProvider',
             'disableTrackEvent',
         ],
 
@@ -8340,9 +8380,10 @@ if (gamepadFound) {
         [
             'overrideSettings',
             ENABLE_NATIVE_MKB_BETA && 'mkbIsMouseAndKeyboardTitle',
-            HAS_TOUCH_SUPPORT && 'patchUpdateInputConfigurationAsync',
         ],
 
+        getPref(Preferences.REMOTE_PLAY_ENABLED) && HAS_TOUCH_SUPPORT && ['patchUpdateInputConfigurationAsync'],
+
         getPref(Preferences.GAME_FORTNITE_FORCE_CONSOLE) && ['forceFortniteConsole'],
     ];
 
@@ -9672,7 +9713,7 @@ div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module] {
 }
 
 #bx-touch-controller-bar[data-showing=true] {
-    display: block !important;
+    display: block;
 }
 
 .bx-wait-time-box {