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

Update better-xcloud.user.js

Browse Source
This commit is contained in:
redphx 2024-05-25 11:41:10 +07:00
parent 17e02e5b32
commit 579dc6bf40
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3464,6 +3464,9 @@ class ControllerShortcut {
for (button in ControllerShortcut.#$selectActions) { for (button in ControllerShortcut.#$selectActions) {
const $select = ControllerShortcut.#$selectActions[button]; const $select = ControllerShortcut.#$selectActions[button];
$select.value = actions[button] || ""; $select.value = actions[button] || "";
BxEvent.dispatch($select, "change", {
ignoreOnChange: true
});
} }
} }
static renderSettings() { static renderSettings() {
@ -3486,13 +3489,13 @@ class ControllerShortcut {
}; };
const actions = { const actions = {
[t("stream")]: { [t("stream")]: {
[ShortcutAction.STREAM_SCREENSHOT_CAPTURE]: [t("stream"), t("take-screenshot")], [ShortcutAction.STREAM_SCREENSHOT_CAPTURE]: t("take-screenshot"),
[ShortcutAction.STREAM_STATS_TOGGLE]: [t("stream"), t("stats"), t("show-hide")], [ShortcutAction.STREAM_STATS_TOGGLE]: [t("stats"), t("show-hide")],
[ShortcutAction.STREAM_MICROPHONE_TOGGLE]: [t("stream"), t("microphone"), t("toggle")], [ShortcutAction.STREAM_MICROPHONE_TOGGLE]: [t("microphone"), t("toggle")],
[ShortcutAction.STREAM_MENU_TOGGLE]: [t("stream"), t("menu"), t("show")], [ShortcutAction.STREAM_MENU_TOGGLE]: [t("menu"), t("show")],
[ShortcutAction.STREAM_SOUND_TOGGLE]: [t("stream"), t("sound"), t("toggle")], [ShortcutAction.STREAM_SOUND_TOGGLE]: [t("sound"), t("toggle")],
[ShortcutAction.STREAM_VOLUME_INC]: getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && [t("stream"), t("volume"), t("increase")], [ShortcutAction.STREAM_VOLUME_INC]: getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && [t("volume"), t("increase")],
[ShortcutAction.STREAM_VOLUME_DEC]: getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && [t("stream"), t("volume"), t("decrease")] [ShortcutAction.STREAM_VOLUME_DEC]: getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && [t("volume"), t("decrease")]
} }
}; };
const $baseSelect = CE("select", { autocomplete: "off" }, CE("option", { value: "" }, "---")); const $baseSelect = CE("select", { autocomplete: "off" }, CE("option", { value: "" }, "---"));
@ -3526,7 +3529,15 @@ class ControllerShortcut {
const profile = $profile.value; const profile = $profile.value;
const button2 = $target.dataset.button; const button2 = $target.dataset.button;
const action = $target.value; const action = $target.value;
ControllerShortcut.#updateAction(profile, button2, action); const $fakeSelect = $target.previousElementSibling;
let fakeText = "---";
if (action) {
const $selectedOption = $target.options[$target.selectedIndex];
const $optGroup = $selectedOption.parentElement;
fakeText = $optGroup.label + " ❯ " + $selectedOption.text;
}
$fakeSelect.firstElementChild.text = fakeText;
!e.ignoreOnChange && ControllerShortcut.#updateAction(profile, button2, action);
}; };
const $remap = CE("div", { class: "bx-gone" }); const $remap = CE("div", { class: "bx-gone" });
let button; let button;
@ -3534,12 +3545,16 @@ class ControllerShortcut {
const $row = CE("div", { class: "bx-shortcut-row" }); const $row = CE("div", { class: "bx-shortcut-row" });
const prompt2 = buttons[button]; const prompt2 = buttons[button];
const $label = CE("label", { class: "bx-prompt" }, `${PrompFont.HOME} + ${prompt2}`); const $label = CE("label", { class: "bx-prompt" }, `${PrompFont.HOME} + ${prompt2}`);
const $div = CE("div", { class: "bx-shortcut-actions" });
const $fakeSelect = CE("select", { autocomplete: "off" }, CE("option", {}, "---"));
$div.appendChild($fakeSelect);
const $select = $baseSelect.cloneNode(true); const $select = $baseSelect.cloneNode(true);
$select.dataset.button = button.toString(); $select.dataset.button = button.toString();
$select.addEventListener("change", onActionChanged); $select.addEventListener("change", onActionChanged);
ControllerShortcut.#$selectActions[button] = $select; ControllerShortcut.#$selectActions[button] = $select;
$div.appendChild($select);
$row.appendChild($label); $row.appendChild($label);
$row.appendChild($select); $row.appendChild($div);
$remap.appendChild($row); $remap.appendChild($row);
} }
$container.appendChild($remap); $container.appendChild($remap);
@ -6993,9 +7008,21 @@ div[data-testid=media-container].bx-taking-screenshot:before {
flex: 1; flex: 1;
font-family: var(--bx-promptfont-font); font-family: var(--bx-promptfont-font);
font-size: 26px; font-size: 26px;
margin-bottom: 0;
} }
.bx-quick-settings-tab-contents div[data-group="shortcuts"] .bx-shortcut-row select { .bx-quick-settings-tab-contents div[data-group="shortcuts"] .bx-shortcut-row .bx-shortcut-actions {
flex: 2; flex: 2;
position: relative;
}
.bx-quick-settings-tab-contents div[data-group="shortcuts"] .bx-shortcut-row .bx-shortcut-actions select {
position: absolute;
width: 100%;
height: 100%;
display: block;
}
.bx-quick-settings-tab-contents div[data-group="shortcuts"] .bx-shortcut-row .bx-shortcut-actions select:last-of-type {
opacity: 0;
z-index: calc(var(--bx-stream-settings-z-index) + 1);
} }
.bx-mkb-settings { .bx-mkb-settings {
display: flex; display: flex;