marcel/better-xcloud
1
0
Fork 0
mirror of https://github.com/redphx/better-xcloud.git synced 2025-06-06 07:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Settings button keep being added/removed from header

Browse Source
This commit is contained in:
redphx 2024-08-14 08:51:23 +07:00
parent d929a958ff
commit 382cd1aa51
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/index.ts
View File

@ -119,7 +119,7 @@ document.addEventListener('readystatechange', e => {
getPref(PrefKey.REMOTE_PLAY_ENABLED) && RemotePlay.preload(); getPref(PrefKey.REMOTE_PLAY_ENABLED) && RemotePlay.preload();
} else { } else {
// Show Settings button in the header when not signed in // Show Settings button in the header when not signed in
HeaderSection.watchHeader(); window.setTimeout(HeaderSection.watchHeader, 2000);
} }
// Hide "Play with Friends" skeleton section // Hide "Play with Friends" skeleton section
@ -153,7 +153,7 @@ window.addEventListener(BxEvent.XCLOUD_SERVERS_UNAVAILABLE, e => {
window.addEventListener(BxEvent.XCLOUD_SERVERS_READY, e => { window.addEventListener(BxEvent.XCLOUD_SERVERS_READY, e => {
STATES.isSignedIn = true; STATES.isSignedIn = true;
HeaderSection.watchHeader(); window.setTimeout(HeaderSection.watchHeader, 2000);
}); });
window.addEventListener(BxEvent.STREAM_LOADING, e => { window.addEventListener(BxEvent.STREAM_LOADING, e => {

7
src/modules/ui/dialog/navigation-dialog.ts
View File

@ -2,7 +2,7 @@ import { GamepadKey } from "@/enums/mkb";
import { EmulatedMkbHandler } from "@/modules/mkb/mkb-handler"; import { EmulatedMkbHandler } from "@/modules/mkb/mkb-handler";
import { BxEvent } from "@/utils/bx-event"; import { BxEvent } from "@/utils/bx-event";
import { STATES } from "@/utils/global"; import { STATES } from "@/utils/global";
import { CE } from "@/utils/html"; import { CE, isElementVisible } from "@/utils/html";
import { setNearby } from "@/utils/navigation-utils"; import { setNearby } from "@/utils/navigation-utils";
export enum NavigationDirection { export enum NavigationDirection {
@ -519,11 +519,8 @@ export class NavigationDialogManager {
return null; return null;
} }
const rect = $elm.getBoundingClientRect();
const isVisible = !!rect.width && !!rect.height;
// Ignore hidden element // Ignore hidden element
if (!isVisible) { if (!isElementVisible($elm)) {
return null; return null;
} }

15
src/modules/ui/header.ts
View File

@ -1,5 +1,5 @@
import { SCRIPT_VERSION } from "@utils/global"; import { SCRIPT_VERSION } from "@utils/global";
import { createButton, ButtonStyle, CE } from "@utils/html"; import { createButton, ButtonStyle, CE, isElementVisible } from "@utils/html";
import { BxIcon } from "@utils/bx-icon"; import { BxIcon } from "@utils/bx-icon";
import { getPreferredServerRegion } from "@utils/region"; import { getPreferredServerRegion } from "@utils/region";
import { RemotePlay } from "@modules/remote-play"; import { RemotePlay } from "@modules/remote-play";
@ -44,12 +44,16 @@ export class HeaderSection {
const PREF_LATEST_VERSION = getPref(PrefKey.LATEST_VERSION); const PREF_LATEST_VERSION = getPref(PrefKey.LATEST_VERSION);
// Setup Settings button // Setup Settings button
const $settingsBtn = HeaderSection.#$settingsBtn; const $btnSettings = HeaderSection.#$settingsBtn;
$settingsBtn.querySelector('span')!.textContent = getPreferredServerRegion(true) || t('better-xcloud'); if (isElementVisible(HeaderSection.#$buttonsWrapper)) {
return;
}
$btnSettings.querySelector('span')!.textContent = getPreferredServerRegion(true) || t('better-xcloud');
// Show new update status // Show new update status
if (!SCRIPT_VERSION.includes('beta') && PREF_LATEST_VERSION && PREF_LATEST_VERSION !== SCRIPT_VERSION) { if (!SCRIPT_VERSION.includes('beta') && PREF_LATEST_VERSION && PREF_LATEST_VERSION !== SCRIPT_VERSION) {
$settingsBtn.setAttribute('data-update-available', 'true'); $btnSettings.setAttribute('data-update-available', 'true');
} }
// Add the Settings button to the web page // Add the Settings button to the web page
@ -75,6 +79,9 @@ export class HeaderSection {
return; return;
} }
HeaderSection.#timeout && clearTimeout(HeaderSection.#timeout);
HeaderSection.#timeout = null;
HeaderSection.#observer && HeaderSection.#observer.disconnect(); HeaderSection.#observer && HeaderSection.#observer.disconnect();
HeaderSection.#observer = new MutationObserver(mutationList => { HeaderSection.#observer = new MutationObserver(mutationList => {
HeaderSection.#timeout && clearTimeout(HeaderSection.#timeout); HeaderSection.#timeout && clearTimeout(HeaderSection.#timeout);

5
src/utils/html.ts
View File

@ -146,5 +146,10 @@ export function escapeHtml(html: string): string {
return $span.innerHTML; return $span.innerHTML;
} }
export function isElementVisible($elm: HTMLElement): boolean {
const rect = $elm.getBoundingClientRect();
return !!rect.width && !!rect.height;
}
export const CTN = document.createTextNode.bind(document); export const CTN = document.createTextNode.bind(document);
window.BX_CE = createElement; window.BX_CE = createElement;