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

Refactor "data-enabled" to "data-activated"

Browse Source
This commit is contained in:
redphx 2024-10-13 17:32:38 +07:00
parent d012d96675
commit 49fb8e2818
8 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/better-xcloud.lite.user.js vendored
View File

File diff suppressed because one or more lines are too long

38
dist/better-xcloud.user.js vendored
View File

File diff suppressed because one or more lines are too long

10
src/assets/css/game-bar.styl
View File

@ -76,21 +76,21 @@
} }
/* Touch controller buttons */ /* Touch controller buttons */
div[data-enabled] { div[data-activated] {
button { button {
display: none; display: none;
} }
} }
/* Show enabled button */ /* Show default button */
div[data-enabled='true'] { div[data-activated='false'] {
button:first-of-type { button:first-of-type {
display: block; display: block;
} }
} }
/* Show enable button */ /* Show activated button */
div[data-enabled='false'] { div[data-activated='true'] {
button:last-of-type { button:last-of-type {
display: block; display: block;
} }

9
src/modules/game-bar/action-microphone.ts
View File

@ -17,7 +17,7 @@ export class MicrophoneAction extends BaseGameBarAction {
BxEvent.dispatch(window, BxEvent.GAME_BAR_ACTION_ACTIVATED); BxEvent.dispatch(window, BxEvent.GAME_BAR_ACTION_ACTIVATED);
const enabled = MicrophoneShortcut.toggle(false); const enabled = MicrophoneShortcut.toggle(false);
this.$content.setAttribute('data-enabled', enabled.toString()); this.$content.dataset.activated = enabled.toString();
}; };
const $btnDefault = createButton({ const $btnDefault = createButton({
@ -34,8 +34,8 @@ export class MicrophoneAction extends BaseGameBarAction {
}); });
this.$content = CE('div', {}, this.$content = CE('div', {},
$btnDefault,
$btnMuted, $btnMuted,
$btnDefault,
); );
this.reset(); this.reset();
@ -43,8 +43,7 @@ export class MicrophoneAction extends BaseGameBarAction {
window.addEventListener(BxEvent.MICROPHONE_STATE_CHANGED, e => { window.addEventListener(BxEvent.MICROPHONE_STATE_CHANGED, e => {
const microphoneState = (e as any).microphoneState; const microphoneState = (e as any).microphoneState;
const enabled = microphoneState === MicrophoneState.ENABLED; const enabled = microphoneState === MicrophoneState.ENABLED;
this.$content.dataset.activated = enabled.toString();
this.$content.setAttribute('data-enabled', enabled.toString());
// Show the button in Game Bar if the mic is enabled // Show the button in Game Bar if the mic is enabled
this.$content.classList.remove('bx-gone'); this.$content.classList.remove('bx-gone');
@ -58,6 +57,6 @@ export class MicrophoneAction extends BaseGameBarAction {
reset(): void { reset(): void {
this.visible = false; this.visible = false;
this.$content.classList.add('bx-gone'); this.$content.classList.add('bx-gone');
this.$content.setAttribute('data-enabled', 'false'); this.$content.dataset.activated = 'false';
} }
} }

5
src/modules/game-bar/action-renderer.ts
View File

@ -13,7 +13,8 @@ export class RendererAction extends BaseGameBarAction {
const onClick = (e: Event) => { const onClick = (e: Event) => {
BxEvent.dispatch(window, BxEvent.GAME_BAR_ACTION_ACTIVATED); BxEvent.dispatch(window, BxEvent.GAME_BAR_ACTION_ACTIVATED);
this.$content.dataset.enabled = RendererShortcut.toggleVisibility().toString(); const isVisible = RendererShortcut.toggleVisibility();
this.$content.dataset.activated = (!isVisible).toString();
}; };
const $btnDefault = createButton({ const $btnDefault = createButton({
@ -42,6 +43,6 @@ export class RendererAction extends BaseGameBarAction {
} }
reset(): void { reset(): void {
this.$content.dataset.enabled = 'true'; this.$content.dataset.activated = 'false';
} }
} }

4
src/modules/game-bar/action-speaker.ts
View File

@ -40,7 +40,7 @@ export class SpeakerAction extends BaseGameBarAction {
const speakerState = (e as any).speakerState; const speakerState = (e as any).speakerState;
const enabled = speakerState === SpeakerState.ENABLED; const enabled = speakerState === SpeakerState.ENABLED;
this.$content.dataset.enabled = enabled.toString(); this.$content.dataset.activated = (!enabled).toString();
}); });
} }
@ -49,6 +49,6 @@ export class SpeakerAction extends BaseGameBarAction {
} }
reset(): void { reset(): void {
this.$content.dataset.enabled = 'true'; this.$content.dataset.activated = 'false';
} }
} }

10
src/modules/game-bar/action-touch-control.ts
View File

@ -14,11 +14,9 @@ export class TouchControlAction extends BaseGameBarAction {
const onClick = (e: Event) => { const onClick = (e: Event) => {
BxEvent.dispatch(window, BxEvent.GAME_BAR_ACTION_ACTIVATED); BxEvent.dispatch(window, BxEvent.GAME_BAR_ACTION_ACTIVATED);
const $parent = (e as any).target.closest('div[data-enabled]'); const $parent = (e as any).target.closest('div[data-activated]');
let enabled = $parent.getAttribute('data-enabled', 'true') === 'true'; const isVisible = TouchController.toggleVisibility();
$parent.setAttribute('data-enabled', (!enabled).toString()); $parent.dataset.activated = (!isVisible).toString();
TouchController.toggleVisibility(enabled);
}; };
const $btnEnable = createButton({ const $btnEnable = createButton({
@ -49,6 +47,6 @@ export class TouchControlAction extends BaseGameBarAction {
} }
reset(): void { reset(): void {
this.$content.setAttribute('data-enabled', 'true'); this.$content.dataset.activated = 'false';
} }
} }

14
src/modules/touch-controller.ts
View File

@ -85,16 +85,24 @@ export class TouchController {
document.querySelector('#BabylonCanvasContainer-main')?.parentElement?.classList.remove('bx-offscreen'); document.querySelector('#BabylonCanvasContainer-main')?.parentElement?.classList.remove('bx-offscreen');
} }
/*
static #hide() { static #hide() {
document.querySelector('#BabylonCanvasContainer-main')?.parentElement?.classList.add('bx-offscreen'); document.querySelector('#BabylonCanvasContainer-main')?.parentElement?.classList.add('bx-offscreen');
} }
*/
static toggleVisibility(status: boolean) { static toggleVisibility(): boolean {
if (!TouchController.#dataChannel) { if (!TouchController.#dataChannel) {
return; return false;
} }
status ? TouchController.#hide() : TouchController.#show(); const $container = document.querySelector('#BabylonCanvasContainer-main')?.parentElement;
if (!$container) {
return false;
}
$container.classList.toggle('bx-offscreen');
return !$container.classList.contains('bx-offscreen');
} }
static reset() { static reset() {