Latest public/internal sync.

efroemling · Sep 9, 2024 · 07fccaf · 07fccaf
1 parent 95f73af
commit 07fccaf
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 42 deletions.
diff --git a/.efrocachemap b/.efrocachemap
diff --git a/src/assets/ba_data/python/bascenev1lib/mainmenu.py b/src/assets/ba_data/python/bascenev1lib/mainmenu.py
@@ -595,9 +595,8 @@ def _make_logo(
                     'tilt_translate': 0.21,
                     'absolute_scale': True,
                     'scale': (
-                        (2000.0,2000.0) if custom_texture is None
-                        else None
-                    )
+                        (2000.0, 2000.0) if custom_texture is None else None
+                    ),
                 },
             )
         )
@@ -608,6 +607,7 @@ def _make_logo(
         # (unless we're in VR mode in which case its best to
         # leave things still).
         assert logo.node
+
         def jitter() -> None:
             if not bs.app.env.vr:
                 cmb = bs.newnode('combine', owner=logo.node, attrs={'size': 2})
@@ -632,18 +632,18 @@ def jitter() -> None:
                 bs.animate(cmb, 'input1', keys, loop=True)
 
         if custom_texture is None:
+
             def rotate_logo() -> None:
                 logo_scale = logo.node.scale
                 assert not isinstance(logo_scale, float)
                 logo.node.rotate = logo.node.rotate + 4
-                logo.node.scale = (
-                    logo_scale[0] - 20, logo_scale[1] - 20
-                )
+                logo.node.scale = (logo_scale[0] - 20, logo_scale[1] - 20)
                 if logo.node.rotate >= 356:
                     self._logo_rotate_timer = None
                     jitter()
+
             self._logo_rotate_timer = bs.Timer(
-                0.001, functools.partial(rotate_logo), repeat = True
+                0.001, functools.partial(rotate_logo), repeat=True
             )
         else:
             jitter()

diff --git a/src/assets/ba_data/python/bauiv1lib/settings/controls.py b/src/assets/ba_data/python/bauiv1lib/settings/controls.py
@@ -148,8 +148,9 @@ def __init__(
 
         bui.textwidget(
             parent=self._root_widget,
-            position=(0, height + yoffs - (
-                75 if uiscale is bui.UIScale.SMALL else 50)
+            position=(
+                0,
+                height + yoffs - (75 if uiscale is bui.UIScale.SMALL else 50),
             ),
             size=(width, 25),
             text=bui.Lstr(resource=f'{self._r}.titleText'),
@@ -298,8 +299,10 @@ def do_toggle(value: bool) -> None:
 
             xinput_checkbox = bui.checkboxwidget(
                 parent=self._root_widget,
-                position=(width * (
-                    0.35 if uiscale is bui.UIScale.SMALL else 0.25), v + 3),
+                position=(
+                    width * (0.35 if uiscale is bui.UIScale.SMALL else 0.25),
+                    v + 3,
+                ),
                 size=(120, 30),
                 value=(not bui.get_low_level_config_value('enablexinput', 1)),
                 maxwidth=200,

diff --git a/src/ballistica/ui_v1/ui_v1.h b/src/ballistica/ui_v1/ui_v1.h
@@ -125,9 +125,7 @@ class UIV1FeatureSet : public FeatureSetNativeComponent,
   auto always_use_internal_on_screen_keyboard() const {
     return always_use_internal_on_screen_keyboard_;
   }
-  auto set_party_window_open(bool value) {
-    party_window_open_ = value;
-  }
+  auto set_party_window_open(bool value) { party_window_open_ = value; }
 
   auto HasQuitConfirmDialog() -> bool override;
   void ConfirmQuit(QuitType quit_type) override;