RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-07 08:03:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

preflight.jpeg

Browse Source
This commit is contained in:
TrialTemp 2024-01-09 18:56:37 -06:00
parent 878665391e
commit 64743e2602
4 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/assets/ba_data/python/baclassic/_input.py
View File

@ -13,7 +13,10 @@ if TYPE_CHECKING:
def get_input_device_mapped_value( 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: ) -> Any:
"""Returns a mapped value for an input device. """Returns a mapped value for an input device.

5
src/assets/ba_data/python/baclassic/_subsystem.py
View File

@ -570,7 +570,10 @@ class ClassicSubsystem(babase.AppSubsystem):
) )
def get_input_device_mapped_value( 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: ) -> Any:
"""Returns a mapped value for an input device. """Returns a mapped value for an input device.

23
src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
View File

@ -194,7 +194,9 @@ class GamepadSettingsWindow(bui.Window):
on_activate_call=self._reset, on_activate_call=self._reset,
) )
if 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 save_button: bui.Widget | None
if not self._is_secondary: if not self._is_secondary:
save_button = bui.buttonwidget( save_button = bui.buttonwidget(
@ -397,8 +399,12 @@ class GamepadSettingsWindow(bui.Window):
try: try:
bui.widget( bui.widget(
edit=cancel_button, 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( bui.widget(
edit=reset_button, edit=reset_button,
left_widget=cancel_button if cancel_button else None, left_widget=cancel_button if cancel_button else None,
@ -406,7 +412,11 @@ class GamepadSettingsWindow(bui.Window):
) )
bui.widget( bui.widget(
edit=save_button, 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: except Exception:
logging.exception('Error wiring up gamepad config window.') logging.exception('Error wiring up gamepad config window.')
@ -831,7 +841,7 @@ class GamepadSettingsWindow(bui.Window):
ControlsSettingsWindow(transition='in_left').get_root_widget(), ControlsSettingsWindow(transition='in_left').get_root_widget(),
from_window=self._root_widget, from_window=self._root_widget,
) )
def _reset(self) -> None: def _reset(self) -> None:
from bauiv1lib.confirm import ConfirmWindow from bauiv1lib.confirm import ConfirmWindow
@ -844,7 +854,7 @@ class GamepadSettingsWindow(bui.Window):
width=480, width=480,
height=110, height=110,
) )
def _do_reset(self) -> None: def _do_reset(self) -> None:
"""Resets the input's mapping settings.""" """Resets the input's mapping settings."""
self._settings: dict[str, int] = {} self._settings: dict[str, int] = {}
@ -852,7 +862,6 @@ class GamepadSettingsWindow(bui.Window):
self._rebuild_ui(reset=True) self._rebuild_ui(reset=True)
bui.getsound('gunCocking').play() bui.getsound('gunCocking').play()
def _save(self) -> None: def _save(self) -> None:
classic = bui.app.classic classic = bui.app.classic
assert classic is not None assert classic is not None

16
src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
View File

@ -48,10 +48,10 @@ class ConfigKeyboardWindow(bui.Window):
transition=transition, transition=transition,
) )
) )
self._settings: dict[str, int] = {} self._settings: dict[str, int] = {}
self._get_config_mapping() self._get_config_mapping()
self._rebuild_ui() self._rebuild_ui()
def _get_config_mapping(self, default: bool = False): def _get_config_mapping(self, default: bool = False):
@ -102,7 +102,9 @@ class ConfigKeyboardWindow(bui.Window):
on_activate_call=self._reset, on_activate_call=self._reset,
) )
if 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( save_button = bui.buttonwidget(
parent=self._root_widget, parent=self._root_widget,
autoselect=True, autoselect=True,
@ -120,7 +122,11 @@ class ConfigKeyboardWindow(bui.Window):
) )
bui.widget(edit=cancel_button, right_widget=reset_button) 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) bui.widget(edit=save_button, left_widget=reset_button)
v = self._height - 74.0 v = self._height - 74.0
@ -313,7 +319,7 @@ class ConfigKeyboardWindow(bui.Window):
width=480, width=480,
height=95, height=95,
) )
def _do_reset(self) -> None: def _do_reset(self) -> None:
"""Resets the input's mapping settings.""" """Resets the input's mapping settings."""
self._settings: dict[str, int] = {} self._settings: dict[str, int] = {}