From de85edbce6e606a47a1ecc76baf7f0cf90bec6ab Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 22 Jun 2024 22:44:49 -0700 Subject: [PATCH] Latest public/internal sync. --- src/assets/ba_data/python/bauiv1lib/config.py | 10 ++++++---- .../ba_data/python/bauiv1lib/settings/controls.py | 4 ++-- .../ba_data/python/bauiv1lib/settings/plugins.py | 9 ++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/assets/ba_data/python/bauiv1lib/config.py b/src/assets/ba_data/python/bauiv1lib/config.py index 52a315c3..82e6976f 100644 --- a/src/assets/ba_data/python/bauiv1lib/config.py +++ b/src/assets/ba_data/python/bauiv1lib/config.py @@ -109,9 +109,11 @@ class ConfigNumberEdit: self._value = bui.app.config.resolve(configkey) except ValueError: self._value = bui.app.config.get(configkey, fallback_value) - self._value = (self._minval if self._minval > self._value else - self._maxval if self._maxval < self._value else - self._value) + self._value = ( + self._minval + if self._minval > self._value + else self._maxval if self._maxval < self._value else self._value + ) self._as_percent = as_percent self._f = f @@ -120,7 +122,7 @@ class ConfigNumberEdit: position=position, size=(100, 30), text=displayname, - #maxwidth=160 + xoffset, + # maxwidth=160 + xoffset, color=(0.8, 0.8, 0.8, 1.0), h_align='left', v_align='center', diff --git a/src/assets/ba_data/python/bauiv1lib/settings/controls.py b/src/assets/ba_data/python/bauiv1lib/settings/controls.py index 82471101..756214b0 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/controls.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/controls.py @@ -258,7 +258,7 @@ class ControlsSettingsWindow(bui.Window): v -= spacing bui.widget( edit=self._keyboard_2_button, - left_widget=self._keyboard_2_button + left_widget=self._keyboard_2_button, ) if show_space_2: v -= space_height @@ -323,7 +323,7 @@ class ControlsSettingsWindow(bui.Window): bui.widget( edit=xinput_checkbox, left_widget=xinput_checkbox, - right_widget=xinput_checkbox + right_widget=xinput_checkbox, ) v -= spacing diff --git a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py index c62b9eb2..b33216b6 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py @@ -349,9 +349,12 @@ class PluginWindow(bui.Window): text=bui.Lstr(value=classpath), autoselect=True, value=enabled, - maxwidth=self._scroll_width - ( - 200 if plugin is not None and plugin.has_settings_ui() else - 80), + maxwidth=self._scroll_width + - ( + 200 + if plugin is not None and plugin.has_settings_ui() + else 80 + ), position=(10, item_y), size=(self._scroll_width - 40, 50), on_value_change_call=bui.Call(