RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-19 13:25:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed inbox spacing issues

Browse Source
This commit is contained in:
Eric Froemling 2025-01-13 07:36:31 -08:00
parent 764c2c5d19
commit 206e3d7f4b
No known key found for this signature in database
5 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.efrocachemap generated
View File

@ -4126,22 +4126,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": "520f65d1f0c55f6445f2b0eecfd955b3",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "7d43a17ebf6754ab776df42dd0ff427c",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ffb50fe914c0f3adbddbb96d632fa3ce",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c5ebbdbd0e36b0c591d79fce53d9fdab",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1e355db92878f4515b3567aa8dfde4e0",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "4e8e6c9c43eebbed3bdb4ff4644743b5",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b78d0817ea837c82073f0338db00a1a6",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "c48294ee229710c55f656ec8316b90b8",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1add252d56e0acf9d54c5c17d9bcb626",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "94ef443d4de4e805bf61cac7cb6ccde1",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "17c30c1a162a6320c9fddcfaa53c791b",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "25971a2e72d7743e1fd928a30d2887d4",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "595118946b7031bf49dce4a6adcd9500",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "336a6b02255337df748a9f73a2a011ec",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "d15e84e5d82e4a1e0273cd2fae35a9a5",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "7b2030ffeecbd855edec3f6154933a58",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d0d676371cecc9fff81f2b23fa6e7275",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "1a8c30616d66c2ab31879d44c355a436",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "b7e5a81d1170d4e932d06c48e4500fe6",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "e28fcdb70262585d0b3ae62f75d8e487",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "714db737373c55db0126046e3a5998cf",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "eb601b6b70a673fa8b5f67e766bf2a5e",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "618d617773fce1dc2cc0a7dcc48722e2",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "3a95038a0d6ec21e53585613d5736f64",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5b3e194acd4d65030362258c19c5c378",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "5d8bcc750c247f14fe44bd0a8c432e36",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c31c365f0353760437328dc05badf43a",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "9dbcec2283230c23e21e7a607153d322",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "25b1790251a2190bbb8b036cf764b11f",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "4d08c824bff1dccf9b9fe5f5af011023",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "2b93477aa54b233ce0e65805eac1c160",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "321b48eeb777a3955b3afd250e99c4c5",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "40daac4bbc8990d5140f97e792bc4fb1",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61",
@ -4154,14 +4154,14 @@
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "51884d81e2d7bdeb6b59a72f0247c8e1",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "d05c5a6ce080fa3fc7c428cce5a33355",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "469d83a3e925ca952cc8cf568aa1788c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "f8029971cd756dcd67ac51e6826eef6b",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "68befbd9239dd04e6d3ef2a7ba7c6e71",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "5b564bbd1bb87c62c590662939a8287a",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "e32ebebff970306cccb7ff3de847a538",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b00f4040bfd3db8c342e8210a941709a",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "1acc0316367d429a78f4bb1b604a0595",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "b73abcca68eebe3067b6fe13db2d6545",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "ef9b111ceb3bb8566ae0c0d6579c06a3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "426c27616a8c706e27ea94b308cc4f98",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a1c5a7fa4b717ec9edf2cd030ff189ef",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "9a4debdbef814405208292bdeb7bee18",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "dc38927a539aa85ce720e085ee28490d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "1256eedc2b351c1264e55a90f37efca9",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "ae14008d451581c06702334f94b50d4d",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22181, api 9, 2025-01-11)
### 1.7.37 (build 22184, api 9, 2025-01-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 = 22181
TARGET_BALLISTICA_BUILD = 22184
TARGET_BALLISTICA_VERSION = '1.7.37'

23
src/assets/ba_data/python/bauiv1lib/inbox.py
View File

@ -205,11 +205,11 @@ class InboxWindow(bui.MainWindow):
parent=self._root_widget,
size=(
self._width - 60,
self._height - (170 if uiscale is bui.UIScale.SMALL else 70),
self._height - (170 if uiscale is bui.UIScale.SMALL else 80),
),
position=(
30,
(110 if uiscale is bui.UIScale.SMALL else 30) + yoffs,
(110 if uiscale is bui.UIScale.SMALL else 34) + yoffs,
),
capture_arrows=True,
simple_culling_v=200,
@ -472,10 +472,19 @@ class InboxWindow(bui.MainWindow):
bui.spinnerwidget(edit=self._loading_spinner, visible=False)
bui.textwidget(edit=self._infotext, text='')
uiscale = bui.app.ui_v1.uiscale
margin_top = 0.0 if uiscale is bui.UIScale.SMALL else 10.0
margin_v = 0.0 if uiscale is bui.UIScale.SMALL else 5.0
# Need this to avoid the dock blocking access to buttons on our
# bottom message.
margin_bottom = 60.0 if uiscale is bui.UIScale.SMALL else 10.0
# Even though our window size varies with uiscale, we want
# notifications to target a fixed width.
sub_width = 400.0
sub_height = 0.0
sub_height = margin_top
# Construct entries for everything we'll display.
for i, wrapper in enumerate(response.wrappers):
@ -558,7 +567,9 @@ class InboxWindow(bui.MainWindow):
color=color,
)
)
sub_height += total_height
sub_height += margin_v + total_height
sub_height += margin_bottom
subcontainer = bui.containerwidget(
id='inboxsub',
@ -575,7 +586,7 @@ class InboxWindow(bui.MainWindow):
assert bui.app.classic is not None
buttonrows: list[list[bui.Widget]] = []
y = sub_height
y = sub_height - margin_top
for i, _wrapper in enumerate(response.wrappers):
entry_display = self._entry_displays[i]
entry_display_weak = weakref.ref(entry_display)
@ -681,7 +692,7 @@ class InboxWindow(bui.MainWindow):
buttonrows.append(buttonrow)
y -= entry_display.total_height
y -= margin_v + entry_display.total_height
uiscale = bui.app.ui_v1.uiscale
above_widget = (

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 = 22181;
const int kEngineBuildNumber = 22184;
const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9;