From 64743e26020b9d6c5ef7f5f3a40668f15bd41d90 Mon Sep 17 00:00:00 2001 From: TrialTemp Date: Tue, 9 Jan 2024 18:56:37 -0600 Subject: [PATCH] preflight.jpeg --- src/assets/ba_data/python/baclassic/_input.py | 5 +++- .../ba_data/python/baclassic/_subsystem.py | 5 +++- .../python/bauiv1lib/settings/gamepad.py | 23 +++++++++++++------ .../python/bauiv1lib/settings/keyboard.py | 16 +++++++++---- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/assets/ba_data/python/baclassic/_input.py b/src/assets/ba_data/python/baclassic/_input.py index 7c813401..0effcb5b 100644 --- a/src/assets/ba_data/python/baclassic/_input.py +++ b/src/assets/ba_data/python/baclassic/_input.py @@ -13,7 +13,10 @@ if TYPE_CHECKING: def get_input_device_mapped_value( - devicename: str, unique_id: str, name: str, default: bool = False, + devicename: str, + unique_id: str, + name: str, + default: bool = False, ) -> Any: """Returns a mapped value for an input device. diff --git a/src/assets/ba_data/python/baclassic/_subsystem.py b/src/assets/ba_data/python/baclassic/_subsystem.py index 38f35d1d..c9a4cda8 100644 --- a/src/assets/ba_data/python/baclassic/_subsystem.py +++ b/src/assets/ba_data/python/baclassic/_subsystem.py @@ -570,7 +570,10 @@ class ClassicSubsystem(babase.AppSubsystem): ) def get_input_device_mapped_value( - self, device: bascenev1.InputDevice, name: str, default: bool = False, + self, + device: bascenev1.InputDevice, + name: str, + default: bool = False, ) -> Any: """Returns a mapped value for an input device. diff --git a/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py index cc9fba7e..95b0247e 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py @@ -194,7 +194,9 @@ class GamepadSettingsWindow(bui.Window): on_activate_call=self._reset, ) if reset: - bui.containerwidget(edit=self._root_widget, selected_child=reset_button) + bui.containerwidget( + edit=self._root_widget, selected_child=reset_button + ) save_button: bui.Widget | None if not self._is_secondary: save_button = bui.buttonwidget( @@ -397,8 +399,12 @@ class GamepadSettingsWindow(bui.Window): try: bui.widget( edit=cancel_button, - right_widget=reset_button if reset_button else save_button if save_button else None - ) + right_widget=reset_button + if reset_button + else save_button + if save_button + else None, + ) bui.widget( edit=reset_button, left_widget=cancel_button if cancel_button else None, @@ -406,7 +412,11 @@ class GamepadSettingsWindow(bui.Window): ) bui.widget( edit=save_button, - left_widget=reset_button if reset_button else cancel_button if cancel_button else None + left_widget=reset_button + if reset_button + else cancel_button + if cancel_button + else None, ) except Exception: logging.exception('Error wiring up gamepad config window.') @@ -831,7 +841,7 @@ class GamepadSettingsWindow(bui.Window): ControlsSettingsWindow(transition='in_left').get_root_widget(), from_window=self._root_widget, ) - + def _reset(self) -> None: from bauiv1lib.confirm import ConfirmWindow @@ -844,7 +854,7 @@ class GamepadSettingsWindow(bui.Window): width=480, height=110, ) - + def _do_reset(self) -> None: """Resets the input's mapping settings.""" self._settings: dict[str, int] = {} @@ -852,7 +862,6 @@ class GamepadSettingsWindow(bui.Window): self._rebuild_ui(reset=True) bui.getsound('gunCocking').play() - def _save(self) -> None: classic = bui.app.classic assert classic is not None diff --git a/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py index 130576db..7b237d5e 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py @@ -48,10 +48,10 @@ class ConfigKeyboardWindow(bui.Window): transition=transition, ) ) - + self._settings: dict[str, int] = {} self._get_config_mapping() - + self._rebuild_ui() def _get_config_mapping(self, default: bool = False): @@ -102,7 +102,9 @@ class ConfigKeyboardWindow(bui.Window): on_activate_call=self._reset, ) if reset: - bui.containerwidget(edit=self._root_widget, selected_child=reset_button) + bui.containerwidget( + edit=self._root_widget, selected_child=reset_button + ) save_button = bui.buttonwidget( parent=self._root_widget, autoselect=True, @@ -120,7 +122,11 @@ class ConfigKeyboardWindow(bui.Window): ) bui.widget(edit=cancel_button, right_widget=reset_button) - bui.widget(edit=reset_button, left_widget=cancel_button, right_widget=save_button) + bui.widget( + edit=reset_button, + left_widget=cancel_button, + right_widget=save_button, + ) bui.widget(edit=save_button, left_widget=reset_button) v = self._height - 74.0 @@ -313,7 +319,7 @@ class ConfigKeyboardWindow(bui.Window): width=480, height=95, ) - + def _do_reset(self) -> None: """Resets the input's mapping settings.""" self._settings: dict[str, int] = {}