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

tidying

Browse Source
This commit is contained in:
Eric 2023-06-09 10:55:33 -07:00
parent 0cadbc1bec
commit abd2d54645
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
2 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap generated
View File

@ -4080,18 +4080,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/4b/0f/3935287e71cc6a0a329707f157b0",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e9/90/66b477c087a7a5e123182ec4bbfa",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/34/d4/30dcd4b7cc36e00a0b24b4a4e638",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f2/f1/89d36ee327de1da930edf5f6ba41",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/7e/9e/938e630d6ec9441e63eec0f4934b",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/9d/e0/f1d9a6b64086c97314a07d612747",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/85/7f/f547e472c4fde1ed8488a926e84c",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cc/46/636ac189c75f554128de10e2a15a",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/63/b4/081ae5a491ae7734142c322efdb1",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/17/a1/f424cdb674b5320c032afbf671b1",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f4/11/70173d1a40daef28a5ab56120fba",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/c5/f3/a191439ea2f83d5ba2402d0aa85b",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/30/14/0ea9faf33057d6adbf544ada0680",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/da/fe/d36966c57e0075e90c71caccfc35",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/48/24/b6ba4eaa4c87f35c1b55b7c2be42",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/f5/3c/db8f2bf671f379fb301bac0d4d59",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0c/51/f7e6da10c24601b55e4076cc5053",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/2b/6f/347ff35f0b7deb20aaf4ef22dd39",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/5f/ad/a306b072ae102fb92193d88d4f4a",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/b6/45/652409e6d23d2ba8ae45bc57b0ff",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/bc/70/4ac3893f8b6fb5068e127b3fe41f",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/8b/a7/8b4e43e5a2b07e880be150d638b7",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/22/a2/0c87b5fa24da90474008933b0570",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/08/f1/36613a6c3ca87c93b4fbbe0de451",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/08/67/849330893eeb104e5a4dd44db54d",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d4/63/436f0f9b3c22d669bbd6262dee66",
@ -4108,14 +4108,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/0d/da/cf2b3140c0c83b3e368623f1d705",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/94/6c/3489c9df42324ad7f089d6271c4b",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a6/0b/3ae5a82111a12bb75cd62252c2cc",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/46/0c/c77944f3b0a4012542de15d3b349",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/1b/94/b10456205880528c350e5a1d0c80",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/e1/23/9b002389e809ca4771777cc6c336",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/4e/3a/e02dfde664b36ac2764828c847ca",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/64/6d/69559ece8d1e5b98e6b6c438e20b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/29/f0/65577466c5028765c2e34dcb8c14",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/f6/7c/6f0d3d4c17849246b305718eabe3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/0d/a7/dd1a7478fef846c6f17dcc1a2a1a",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/07/c5/868cac199d95c99f99bf1a79cdb9",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/c7/4a/0ead10c153f13f2422208044145c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/80/bf/69dd06c2c904227c8f0d6bc09102",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/da/86/2b58ec00034d93f891992051ed30",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/b8/de/acc7e5fd6cfe0cb5d33c048ab399",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/15/06/84046ac383a66b0611a4b6262f2d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/d0/2b/dab33e75b735c1bd439f28ed8709",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/12/ec/8e3000e603e5b6fdd5bc5af94cd0",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
"src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/fe/d2/3be7462aaff43bd651b5b5ac9d04",

67
src/assets/ba_data/python/bauiv1lib/settings/plugins.py
View File

@ -203,8 +203,7 @@ class PluginWindow(bui.Window):
)
def _show_options(self) -> None:
assert bui.app.classic is not None
uiscale = bui.app.classic.ui.uiscale
uiscale = bui.app.ui_v1.uiscale
popup.PopupMenuWindow(
position=self._category_button.get_screen_space_center(),
@ -217,15 +216,10 @@ class PluginWindow(bui.Window):
),
choices=['All', 'Enabled', 'Disabled'],
choices_display=[
bui.Lstr(
resource='AllText'
),
bui.Lstr(
resource='EnabledText'
),
bui.Lstr(
resource='DisabledText'
)],
bui.Lstr(resource='AllText'),
bui.Lstr(resource='EnabledText'),
bui.Lstr(resource='DisabledText'),
],
current_choice='Default',
delegate=self,
)
@ -235,13 +229,13 @@ class PluginWindow(bui.Window):
) -> None:
"""Called when a choice is selected in the popup."""
del popup_window # unused
self._clear_scroll_widget()
self._show_plugins(choice)
bui.buttonwidget(
edit=self._category_button,
label=bui.Lstr(resource=(choice + 'Text'))
label=bui.Lstr(resource=(choice + 'Text')),
)
def popup_menu_closing(self, popup_window: popup.PopupWindow) -> None:
@ -257,7 +251,7 @@ class PluginWindow(bui.Window):
pluglist = bui.app.plugins.potential_plugins
plugstates: dict[str, dict] = bui.app.config.setdefault('Plugins', {})
assert isinstance(plugstates, dict)
plug_line_height = 50
sub_width = self._scroll_width
sub_height = len(pluglist) * plug_line_height
@ -265,7 +259,7 @@ class PluginWindow(bui.Window):
sub_height2 = 0
num_of_plugs_active = 0
num_of_plugs_disabled = 0
for i, availplug in enumerate(pluglist):
# counting number of enabled and disabled plugins
plugin = bui.app.plugins.active_plugins.get(availplug.class_path)
@ -277,26 +271,17 @@ class PluginWindow(bui.Window):
if category == "All":
bui.containerwidget(
edit=self._subcontainer,
size=(self._scroll_width,
sub_height
)
edit=self._subcontainer, size=(self._scroll_width, sub_height)
)
if category == "Enabled":
sub_height1 = num_of_plugs_active * plug_line_height
bui.containerwidget(
edit=self._subcontainer,
size=(self._scroll_width,
sub_height1
)
edit=self._subcontainer, size=(self._scroll_width, sub_height1)
)
elif category == "Disabled":
sub_height2 = num_of_plugs_disabled * plug_line_height
bui.containerwidget(
edit=self._subcontainer,
size=(self._scroll_width,
sub_height2
)
edit=self._subcontainer, size=(self._scroll_width, sub_height2)
)
num_of_plugs = 0
@ -339,7 +324,9 @@ class PluginWindow(bui.Window):
)
bui.buttonwidget(
edit=button,
on_activate_call=bui.Call(plugin.show_settings_ui, button),
on_activate_call=bui.Call(
plugin.show_settings_ui, button
),
)
else:
button = None
@ -357,7 +344,9 @@ class PluginWindow(bui.Window):
# Make sure we scroll all the way to the end when using
# keyboard/button nav.
bui.widget(edit=check, show_buffer_top=40, show_buffer_bottom=40)
bui.widget(
edit=check, show_buffer_top=40, show_buffer_bottom=40
)
elif category == "Enabled":
if active:
@ -389,7 +378,9 @@ class PluginWindow(bui.Window):
)
bui.buttonwidget(
edit=button,
on_activate_call=bui.Call(plugin.show_settings_ui, button),
on_activate_call=bui.Call(
plugin.show_settings_ui, button
),
)
else:
button = None
@ -407,9 +398,11 @@ class PluginWindow(bui.Window):
# Make sure we scroll all the way to the end when using
# keyboard/button nav.
bui.widget(edit=check, show_buffer_top=40, show_buffer_bottom=40)
bui.widget(
edit=check, show_buffer_top=40, show_buffer_bottom=40
)
num_of_plugs = num_of_plugs + 1
elif category == "Disabled":
if availplug.available and not active:
item_y = sub_height2 - (num_of_plugs + 1) * plug_line_height
@ -436,7 +429,9 @@ class PluginWindow(bui.Window):
)
bui.buttonwidget(
edit=button,
on_activate_call=bui.Call(plugin.show_settings_ui, button),
on_activate_call=bui.Call(
plugin.show_settings_ui, button
),
)
else:
button = None
@ -454,7 +449,9 @@ class PluginWindow(bui.Window):
# Make sure we scroll all the way to the end when using
# keyboard/button nav.
bui.widget(edit=check, show_buffer_top=40, show_buffer_bottom=40)
bui.widget(
edit=check, show_buffer_top=40, show_buffer_bottom=40
)
num_of_plugs = num_of_plugs + 1
bui.containerwidget(
@ -478,4 +475,4 @@ class PluginWindow(bui.Window):
assert bui.app.classic is not None
bui.app.ui_v1.set_main_menu_window(
AdvancedSettingsWindow(transition='in_left').get_root_widget()
)
)