mirror of
https://github.com/redphx/better-xcloud.git
synced 2025-06-03 06:07:19 +02:00
Fix forcing native MKB not working when mode = "default"
This commit is contained in:
parent
fe98a1165f
commit
1ca2b771e7
10
dist/better-xcloud.lite.user.js
vendored
10
dist/better-xcloud.lite.user.js
vendored
@ -1514,6 +1514,9 @@ class GlobalSettingsStorage extends BaseSettingsStore {
|
||||
if (!setting.unsupported) setting.multipleOptions = GhPagesUtils.getNativeMkbCustomList(!0), window.addEventListener(BxEvent.GH_PAGES_FORCE_NATIVE_MKB_UPDATED, (e) => {
|
||||
setting.multipleOptions = GhPagesUtils.getNativeMkbCustomList();
|
||||
});
|
||||
},
|
||||
params: {
|
||||
size: 6
|
||||
}
|
||||
},
|
||||
"nativeMkb.scroll.sensitivityX": {
|
||||
@ -3741,7 +3744,7 @@ class SettingElement {
|
||||
let $control = CE("select", {
|
||||
multiple: !0,
|
||||
tabindex: 0
|
||||
}), size = params.size ? params.size : Object.keys(setting.multipleOptions).length;
|
||||
}), totalOptions = Object.keys(setting.multipleOptions).length, size = params.size ? Math.min(params.size, totalOptions) : totalOptions;
|
||||
$control.setAttribute("size", size.toString());
|
||||
for (let value in setting.multipleOptions) {
|
||||
let label = setting.multipleOptions[value], $option = CE("option", { value }, label);
|
||||
@ -4078,7 +4081,8 @@ class SettingsDialog extends NavigationDialog {
|
||||
"nativeMkb.mode",
|
||||
{
|
||||
pref: "nativeMkb.forcedGames",
|
||||
multiLines: !0
|
||||
multiLines: !0,
|
||||
note: CE("a", { href: "https://github.com/redphx/better-xcloud/discussions/574", target: "_blank" }, t("unofficial-game-list"))
|
||||
},
|
||||
"mkb.enabled",
|
||||
"mkb.cursor.hideIdle"
|
||||
@ -6445,7 +6449,7 @@ window.addEventListener("pagehide", (e) => {
|
||||
BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
|
||||
});
|
||||
function main() {
|
||||
if (GhPagesUtils.fetchLatestCommit(), getPref("nativeMkb.mode") === "on") {
|
||||
if (GhPagesUtils.fetchLatestCommit(), getPref("nativeMkb.mode") !== "off") {
|
||||
let customList = getPref("nativeMkb.forcedGames");
|
||||
BX_FLAGS.ForceNativeMkbTitles.push(...customList);
|
||||
}
|
||||
|
10
dist/better-xcloud.user.js
vendored
10
dist/better-xcloud.user.js
vendored
@ -1589,6 +1589,9 @@ class GlobalSettingsStorage extends BaseSettingsStore {
|
||||
if (!setting.unsupported) setting.multipleOptions = GhPagesUtils.getNativeMkbCustomList(!0), window.addEventListener(BxEvent.GH_PAGES_FORCE_NATIVE_MKB_UPDATED, (e) => {
|
||||
setting.multipleOptions = GhPagesUtils.getNativeMkbCustomList();
|
||||
});
|
||||
},
|
||||
params: {
|
||||
size: 6
|
||||
}
|
||||
},
|
||||
"nativeMkb.scroll.sensitivityX": {
|
||||
@ -4871,7 +4874,7 @@ class SettingElement {
|
||||
let $control = CE("select", {
|
||||
multiple: !0,
|
||||
tabindex: 0
|
||||
}), size = params.size ? params.size : Object.keys(setting.multipleOptions).length;
|
||||
}), totalOptions = Object.keys(setting.multipleOptions).length, size = params.size ? Math.min(params.size, totalOptions) : totalOptions;
|
||||
$control.setAttribute("size", size.toString());
|
||||
for (let value in setting.multipleOptions) {
|
||||
let label = setting.multipleOptions[value], $option = CE("option", { value }, label);
|
||||
@ -5928,7 +5931,8 @@ class SettingsDialog extends NavigationDialog {
|
||||
"nativeMkb.mode",
|
||||
{
|
||||
pref: "nativeMkb.forcedGames",
|
||||
multiLines: !0
|
||||
multiLines: !0,
|
||||
note: CE("a", { href: "https://github.com/redphx/better-xcloud/discussions/574", target: "_blank" }, t("unofficial-game-list"))
|
||||
},
|
||||
"mkb.enabled",
|
||||
"mkb.cursor.hideIdle"
|
||||
@ -9303,7 +9307,7 @@ window.addEventListener(BxEvent.CAPTURE_SCREENSHOT, (e) => {
|
||||
ScreenshotManager.getInstance().takeScreenshot();
|
||||
});
|
||||
function main() {
|
||||
if (GhPagesUtils.fetchLatestCommit(), getPref("nativeMkb.mode") === "on") {
|
||||
if (GhPagesUtils.fetchLatestCommit(), getPref("nativeMkb.mode") !== "off") {
|
||||
let customList = getPref("nativeMkb.forcedGames");
|
||||
BX_FLAGS.ForceNativeMkbTitles.push(...customList);
|
||||
}
|
||||
|
@ -47,7 +47,7 @@ export const enum PrefKey {
|
||||
CONTROLLER_POLLING_RATE = 'controller.pollingRate',
|
||||
|
||||
NATIVE_MKB_MODE = 'nativeMkb.mode',
|
||||
FORCE_NATIVE_MKB_GAMES = 'nativeMkb.forcedGames',
|
||||
NATIVE_MKB_FORCED_GAMES = 'nativeMkb.forcedGames',
|
||||
NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY = 'nativeMkb.scroll.sensitivityX',
|
||||
NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY = 'nativeMkb.scroll.sensitivityY',
|
||||
|
||||
|
@ -353,8 +353,8 @@ isFullVersion() && window.addEventListener(BxEvent.CAPTURE_SCREENSHOT, e => {
|
||||
function main() {
|
||||
GhPagesUtils.fetchLatestCommit();
|
||||
|
||||
if (getPref<NativeMkbMode>(PrefKey.NATIVE_MKB_MODE) === NativeMkbMode.ON) {
|
||||
const customList = getPref<string[]>(PrefKey.FORCE_NATIVE_MKB_GAMES);
|
||||
if (getPref<NativeMkbMode>(PrefKey.NATIVE_MKB_MODE) !== NativeMkbMode.OFF) {
|
||||
const customList = getPref<string[]>(PrefKey.NATIVE_MKB_FORCED_GAMES);
|
||||
BX_FLAGS.ForceNativeMkbTitles.push(...customList);
|
||||
}
|
||||
|
||||
|
@ -231,8 +231,9 @@ export class SettingsDialog extends NavigationDialog {
|
||||
items: [
|
||||
PrefKey.NATIVE_MKB_MODE,
|
||||
{
|
||||
pref: PrefKey.FORCE_NATIVE_MKB_GAMES,
|
||||
pref: PrefKey.NATIVE_MKB_FORCED_GAMES,
|
||||
multiLines: true,
|
||||
note: CE('a', { href: 'https://github.com/redphx/better-xcloud/discussions/574', target: '_blank' }, t('unofficial-game-list')),
|
||||
},
|
||||
|
||||
PrefKey.MKB_ENABLED,
|
||||
|
@ -68,10 +68,11 @@ export class SettingElement {
|
||||
tabindex: 0,
|
||||
});
|
||||
|
||||
const size = params.size ? params.size : Object.keys(setting.multipleOptions!).length;
|
||||
const totalOptions = Object.keys(setting.multipleOptions!).length;
|
||||
const size = params.size ? Math.min(params.size, totalOptions) : totalOptions;
|
||||
$control.setAttribute('size', size.toString());
|
||||
|
||||
for (let value in setting.multipleOptions) {
|
||||
for (const value in setting.multipleOptions) {
|
||||
const label = setting.multipleOptions[value];
|
||||
|
||||
const $option = CE<HTMLOptionElement>('option', {value: value}, label) as HTMLOptionElement;
|
||||
|
@ -424,7 +424,7 @@ export class GlobalSettingsStorage extends BaseSettingsStorage {
|
||||
},
|
||||
},
|
||||
|
||||
[PrefKey.FORCE_NATIVE_MKB_GAMES]: {
|
||||
[PrefKey.NATIVE_MKB_FORCED_GAMES]: {
|
||||
label: t('force-native-mkb-games'),
|
||||
default: [],
|
||||
unsupported: !AppInterface && UserAgent.isMobile(),
|
||||
@ -437,6 +437,9 @@ export class GlobalSettingsStorage extends BaseSettingsStorage {
|
||||
});
|
||||
}
|
||||
},
|
||||
params: {
|
||||
size: 6,
|
||||
},
|
||||
},
|
||||
|
||||
[PrefKey.NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY]: {
|
||||
|
Loading…
x
Reference in New Issue
Block a user