more ui work

efroemling · Dec 31, 2024 · 690da5a · 690da5a
1 parent 88e2aff
commit 690da5a
Show file tree

Hide file tree

Showing 28 changed files with 231 additions and 164 deletions.
diff --git a/.efrocachemap b/.efrocachemap
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 1.7.37 (build 22152, api 9, 2024-12-30)
+### 1.7.37 (build 22155, api 9, 2024-12-31)
 - Bumping api version to 9. As you'll see below, there's some UI changes that
   will require a bit of work for any UI mods to adapt to. If your mods don't
   touch UI stuff at all you can simply bump your api version and call it a day.
@@ -171,6 +171,11 @@
   See 'Getter/Setter Function Names' in
   https://github.com/efroemling/ballistica/wiki/Coding-Style-Guide for more
   info.
+- Removed support for tab key navigation. This has been largely ignored for
+  years and behaved in a mostly broken way in all recent UIs. Keyboard users
+  should use arrow keys for navigation. To update any old UI code, search for
+  and remove any 'claims_tab' arguments to UI calls since that argument no
+  longer exists.
 
 ### 1.7.36 (build 21944, api 8, 2024-07-26)
 - Wired up Tokens, BombSquad's new purchasable currency. The first thing these

diff --git a/src/assets/ba_data/python/baclassic/_appmode.py b/src/assets/ba_data/python/baclassic/_appmode.py
@@ -210,6 +210,14 @@ def _update_for_primary_account(
                 chest_1_appearance='',
                 chest_2_appearance='',
                 chest_3_appearance='',
+                chest_0_unlock_time=-1.0,
+                chest_1_unlock_time=-1.0,
+                chest_2_unlock_time=-1.0,
+                chest_3_unlock_time=-1.0,
+                chest_0_ad_allow_time=-1.0,
+                chest_1_ad_allow_time=-1.0,
+                chest_2_ad_allow_time=-1.0,
+                chest_3_ad_allow_time=-1.0,
             )
             self._have_account_values = False
             self._update_ui_live_state()
@@ -281,6 +289,20 @@ def _on_classic_account_data_change(
             chest_3_appearance=(
                 '' if chest3 is None else chest3.appearance.value
             ),
+            chest_0_unlock_time=(
+                -1.0 if chest0 is None else chest0.unlock_time.timestamp()
+            ),
+            chest_1_unlock_time=-1.0,
+            chest_2_unlock_time=-1.0,
+            chest_3_unlock_time=-1.0,
+            chest_0_ad_allow_time=(
+                -1.0
+                if chest0 is None or chest0.ad_allow_time is None
+                else chest0.ad_allow_time.timestamp()
+            ),
+            chest_1_ad_allow_time=-1.0,
+            chest_2_ad_allow_time=-1.0,
+            chest_3_ad_allow_time=-1.0,
         )
 
         # Note that we have values and updated faded state accordingly.

diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py
@@ -53,7 +53,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 22152
+TARGET_BALLISTICA_BUILD = 22155
 TARGET_BALLISTICA_VERSION = '1.7.37'
 
 

diff --git a/src/assets/ba_data/python/bauiv1lib/account/settings.py b/src/assets/ba_data/python/bauiv1lib/account/settings.py
@@ -162,7 +162,6 @@ def __init__(
             ),
             size=(self._scroll_width, self._scroll_height),
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         self._subcontainer: bui.Widget | None = None
@@ -452,7 +451,6 @@ def _refresh(self) -> None:
             size=(self._sub_width, self._sub_height),
             background=False,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
 

diff --git a/src/assets/ba_data/python/bauiv1lib/coop/browser.py b/src/assets/ba_data/python/bauiv1lib/coop/browser.py
@@ -273,7 +273,6 @@ def __init__(
             size=(self._scroll_width, self._scroll_height),
             simple_culling_v=10.0,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         self._subcontainer: bui.Widget | None = None
@@ -717,7 +716,6 @@ def _refresh(self) -> None:
             size=(self._subcontainerwidth, self._subcontainerheight),
             background=False,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
 

diff --git a/src/assets/ba_data/python/bauiv1lib/credits.py b/src/assets/ba_data/python/bauiv1lib/credits.py
@@ -5,6 +5,7 @@
 from __future__ import annotations
 
 import os
+import json
 import logging
 from typing import TYPE_CHECKING, override
 
@@ -24,7 +25,6 @@ def __init__(
     ):
         # pylint: disable=too-many-locals
         # pylint: disable=too-many-statements
-        import json
 
         bui.set_analytics_screen('Credits Window')
 
@@ -332,7 +332,6 @@ def _format_names(names2: Sequence[str], inset: float) -> str:
             size=(self._sub_width, self._sub_height),
             background=False,
             claims_left_right=False,
-            claims_tab=False,
         )
 
         voffs = 0

diff --git a/src/assets/ba_data/python/bauiv1lib/fileselector.py b/src/assets/ba_data/python/bauiv1lib/fileselector.py
@@ -387,12 +387,10 @@ def _refresh(self, file_names: list[str], error: str | None) -> None:
             bui.containerwidget(
                 edit=self._scrollwidget,
                 claims_left_right=False,
-                claims_tab=False,
             )
             bui.containerwidget(
                 edit=self._subcontainer,
                 claims_left_right=False,
-                claims_tab=False,
                 selection_loops=False,
                 print_list_exit_instructions=False,
             )

diff --git a/src/assets/ba_data/python/bauiv1lib/help.py b/src/assets/ba_data/python/bauiv1lib/help.py
@@ -137,7 +137,6 @@ def __init__(
             size=(self._sub_width, self._sub_height),
             background=False,
             claims_left_right=False,
-            claims_tab=False,
         )
 
         spacing = 1.0

diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py b/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py
@@ -205,15 +205,13 @@ def __init__(
             ),
             highlight=False,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         self._subcontainer = bui.containerwidget(
             parent=self._scrollwidget,
             size=(scroll_width, scroll_height),
             background=False,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
 

diff --git a/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py
@@ -99,15 +99,13 @@ def __init__(self, parent_window: GamepadSettingsWindow):
             ),
             size=(self._scroll_width, self._scroll_height),
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         self._subcontainer = bui.containerwidget(
             parent=self._scrollwidget,
             size=(self._sub_width, self._sub_height),
             background=False,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         bui.containerwidget(

diff --git a/src/assets/ba_data/python/bauiv1lib/settings/touchscreen.py b/src/assets/ba_data/python/bauiv1lib/settings/touchscreen.py
@@ -89,15 +89,13 @@ def __init__(
             ),
             size=(self._scroll_width, self._scroll_height),
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         self._subcontainer = bui.containerwidget(
             parent=self._scrollwidget,
             size=(self._sub_width, self._sub_height),
             background=False,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         self._build_gui()

diff --git a/src/assets/ba_data/python/bauiv1lib/soundtrack/edit.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/edit.py
@@ -177,14 +177,12 @@ def __init__(
             size=(self._width - (80 + 2 * x_inset), scroll_height),
             simple_culling_v=10,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         bui.widget(edit=self._text_field, down_widget=self._scrollwidget)
         self._col = bui.columnwidget(
             parent=scrollwidget,
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
 
@@ -256,7 +254,6 @@ def _refresh(self) -> None:
                 parent=self._col,
                 size=(self._width - 40, 40),
                 claims_left_right=True,
-                claims_tab=True,
                 selection_loops_to_parent=True,
             )
             type_name = type_names_translated.get(song_type, song_type)

diff --git a/src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py
@@ -65,13 +65,11 @@ def __init__(
             parent=self._root_widget,
             position=(40, v - 340),
             size=(self._width - 80, 400),
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
         bui.widget(edit=self._scrollwidget, right_widget=self._scrollwidget)
         self._column = bui.columnwidget(
             parent=self._scrollwidget,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
 

diff --git a/src/assets/ba_data/python/bauiv1lib/store/browser.py b/src/assets/ba_data/python/bauiv1lib/store/browser.py
@@ -349,7 +349,6 @@ def _set_tab(self, tab_id: TabID) -> None:
             ),
             size=(self._scroll_width, self._scroll_height),
             claims_left_right=True,
-            claims_tab=True,
             selection_loops_to_parent=True,
         )
 
@@ -904,7 +903,6 @@ def instantiate(
                         size=(self._width, self._height),
                         background=False,
                         claims_left_right=True,
-                        claims_tab=True,
                         selection_loops_to_parent=True,
                     )
                     v = self._height - 20
@@ -1142,7 +1140,6 @@ def instantiate(
                     size=(self._scroll_width, self._scroll_height * 0.95),
                     background=False,
                     claims_left_right=True,
-                    claims_tab=True,
                     selection_loops_to_parent=True,
                 )
                 self._status_textwidget = bui.textwidget(

diff --git a/src/ballistica/base/input/device/keyboard_input.cc b/src/ballistica/base/input/device/keyboard_input.cc
@@ -57,11 +57,11 @@ auto KeyboardInput::HandleKey(const SDL_Keysym* keysym, bool down) -> bool {
       if (down) {
         switch (keysym->sym) {
           case SDLK_TAB:
-            if (keysym->mod & KMOD_SHIFT) {  // NOLINT (signed bitwise)
-              c = WidgetMessage::Type::kTabPrev;
-            } else {
-              c = WidgetMessage::Type::kTabNext;
-            }
+            // if (keysym->mod & KMOD_SHIFT) {  // NOLINT (signed bitwise)
+            //   c = WidgetMessage::Type::kTabPrev;
+            // } else {
+            //   c = WidgetMessage::Type::kTabNext;
+            // }
             pass = true;
             break;
           case SDLK_LEFT:

diff --git a/src/ballistica/base/ui/widget_message.h b/src/ballistica/base/ui/widget_message.h
@@ -24,8 +24,8 @@ struct WidgetMessage {
     // In order to work in all-joystick environments,
     // don't rely on the following to be available (they're just a luxury).
     kKey,
-    kTabNext,
-    kTabPrev,
+    // kTabNext,
+    // kTabPrev,
     kMouseDown,
     kMouseUp,
     kMouseWheel,