cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a cursor bug + filter labels to display (to avoir submit with an xbox controller for example)

pull/685/head
Greenlamp 2024-05-11 23:58:47 +02:00
parent fc2a0e06ec
commit 3b693d2231
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ui/settings-gamepad-ui-handler.ts
View File

@ -89,7 +89,13 @@ export default class SettingsGamepadUiHandler extends UiHandler {
const settingLabels = []; const settingLabels = [];
const optionValueLabels = []; const optionValueLabels = [];
const inputsIcons = {}; const inputsIcons = {};
Object.keys(SettingGamepad).forEach((setting, s) => {
const commonSettingKeys = Object.keys(SettingGamepad).slice(0, 3).map(key => SettingGamepad[key]);
const specificBindingKeys = [...commonSettingKeys, ...Object.keys(config.setting).map(k => config.setting[k])];
const optionCursors = Object.values(Object.keys(settingGamepadDefaults).filter(s => specificBindingKeys.includes(s)).map(k => settingGamepadDefaults[k]));
const settingGamepadFiltered = Object.keys(SettingGamepad).filter(_key => specificBindingKeys.includes(SettingGamepad[_key]));
settingGamepadFiltered.forEach((setting, s) => {
let settingName = setting.replace(/\_/g, ' '); let settingName = setting.replace(/\_/g, ' ');
settingLabels[s] = addTextObject(this.scene, 8, 28 + s * 16, settingName, TextStyle.SETTINGS_LABEL); settingLabels[s] = addTextObject(this.scene, 8, 28 + s * 16, settingName, TextStyle.SETTINGS_LABEL);
@ -139,9 +145,6 @@ export default class SettingsGamepadUiHandler extends UiHandler {
} }
}); });
const commonSettingKeys = Object.keys(SettingGamepad).slice(0, 3).map(key => SettingGamepad[key]);
const specificBindingKeys = [...commonSettingKeys, ...Object.keys(config.setting).map(k => config.setting[k])];
const optionCursors = Object.values(Object.keys(settingGamepadDefaults).filter(s => specificBindingKeys.includes(s)).map(k => settingGamepadDefaults[k]));
this.layout[config.padType].optionsContainer = optionsContainer; this.layout[config.padType].optionsContainer = optionsContainer;
this.layout[config.padType].inputsIcons = inputsIcons; this.layout[config.padType].inputsIcons = inputsIcons;
@ -194,6 +197,8 @@ export default class SettingsGamepadUiHandler extends UiHandler {
this.updateBindings(); this.updateBindings();
this.settingsContainer.setVisible(true); this.settingsContainer.setVisible(true);
this.setCursor(0);
this.setScrollCursor(0);
this.getUi().moveTo(this.settingsContainer, this.getUi().length - 1); this.getUi().moveTo(this.settingsContainer, this.getUi().length - 1);
@ -257,7 +262,7 @@ export default class SettingsGamepadUiHandler extends UiHandler {
const ret = super.setCursor(cursor); const ret = super.setCursor(cursor);
if (override) { if (override) {
this.optionsContainer.remove(this.cursorObj); Object.keys(this.layout).forEach(k => this.layout[k].optionsContainer.remove(this.cursorObj));
this.cursorObj = null; this.cursorObj = null;
} }
@ -273,6 +278,7 @@ export default class SettingsGamepadUiHandler extends UiHandler {
} }
updateChosenGamepadDisplay(): void { updateChosenGamepadDisplay(): void {
this.updateBindings();
for (const [index, key] of Object.keys(SettingGamepad).entries()) { for (const [index, key] of Object.keys(SettingGamepad).entries()) {
const setting = SettingGamepad[key] const setting = SettingGamepad[key]
if (setting === SettingGamepad.Default_Controller) { if (setting === SettingGamepad.Default_Controller) {