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

fixed cancel button in modal account settings

Browse Source
This commit is contained in:
Eric Froemling 2024-11-13 11:09:42 -08:00
parent f641fc21c6
commit 8b88d62e8a
No known key found for this signature in database
5 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap generated
View File

@ -4099,22 +4099,22 @@
"build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1",
"build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c17766bb6af443f839155e9b35d7b431",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "1d51f90311351056ed8c0ae30cee883c",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "71458e32defb8cfc17127a2621fead2c",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "7d78be8eef9e0c4e9c5054b814924e15",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "fa6a1343d0fade2263a964ffa5256469",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "7e538ef38a565d5b6112ed4384d50deb",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d0d8cb808b34da8cb7db0a3ae84ee662",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "094fec8a56660496dd7113c3f3dd820d",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "af880b108bebde25960c379b61019d59",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "d018fe9cf1eb4a610ecbf4d305c363e5",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "32b8d1f52d5c1cf1fa894a530f96f24d",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "28495562731e3c4a9653d40261787a6e",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "0f00a3e831f97d1fcf968bbb46de3136",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "9aeb946a4cd875cfdefd7f86a8cf32bd",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "4d8e14542380eee3028cb9a4fe5245f8",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "e25bfb933a2a706965bc1052617cd16b",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c933e9fa75e0852ffb19f4980bdc4fbc",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "8f2ee725f54034f995057b4d3ad4520e",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "18790bb9de9c00fb1f6d7c1224ee6186",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "792dca3022d0173aaba44a49ecbfb780",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "bdb0dabe81f3081adfdef2b4f263b733",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "dbd5ce0b4af918c693cb89d8fde11d48",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "4a5a81688df1771f4871648f91a3f0c0",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b9bc795bfeec565181c6985c09eae809",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "d3dbadc2a27f1cd6ec8a17b754290321",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "8f8d56a18eac08a092fea3168397c465",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b1ae4b2e789600f44bb4ce15aa2e2848",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "45ef289a4291c79f9caf6c13769418f7",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "945ab6076d2c24b9480403c5a01bb558",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "553424754c2336abaa0f921cf89bb664",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e1000aacfe672cedb0a73525a6e9a277",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "6bf81ae3af014a26c4b29cc54b40cdaa",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "462796ac70e26fe008fc0930753e8036",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "45b1203c8f48993bb49cb5ede270cbbf",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22099, api 9, 2024-11-13)
### 1.7.37 (build 22101, api 9, 2024-11-13)
- 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.

2
src/assets/ba_data/python/baenv.py
View File

@ -53,7 +53,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 22099
TARGET_BALLISTICA_BUILD = 22101
TARGET_BALLISTICA_VERSION = '1.7.37'

19
src/assets/ba_data/python/bauiv1lib/account/settings.py
View File

@ -98,7 +98,6 @@ class AccountSettingsWindow(bui.MainWindow):
super().__init__(
root_widget=bui.containerwidget(
size=(self._width, self._height + top_extra),
# transition=transition,
toolbar_visibility=(
'menu_minimal'
if uiscale is bui.UIScale.SMALL
@ -130,10 +129,12 @@ class AccountSettingsWindow(bui.MainWindow):
text_scale=1.2,
autoselect=True,
label=bui.Lstr(
resource='doneText' if self._modal else 'backText'
resource='cancelText' if self._modal else 'backText'
),
button_type='regular' if self._modal else 'back',
on_activate_call=self.main_window_back,
on_activate_call=(
self._modal_close if self._modal else self.main_window_back
),
)
bui.containerwidget(edit=self._root_widget, cancel_button=btn)
if not self._modal:
@ -174,6 +175,18 @@ class AccountSettingsWindow(bui.MainWindow):
self._refresh()
self._restore_state()
def _modal_close(self) -> None:
assert self._modal
# no-op if our underlying widget is dead or on its way out.
if not self._root_widget or self._root_widget.transitioning_out:
return
bui.containerwidget(
edit=self._root_widget,
transition=('out_right'),
)
@override
def get_main_window_state(self) -> bui.MainWindowState:
# Support recreating our window for back/refresh purposes.

2
src/ballistica/shared/ballistica.cc
View File

@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica {
// These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 22099;
const int kEngineBuildNumber = 22101;
const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9;