From 5f46726d203217c8a571e8d7b8d551989d27ec4e Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 8 Oct 2023 22:10:39 +0530 Subject: [PATCH 1/5] Update onscreenkeyboard.py --- src/assets/ba_data/python/bauiv1/onscreenkeyboard.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/assets/ba_data/python/bauiv1/onscreenkeyboard.py b/src/assets/ba_data/python/bauiv1/onscreenkeyboard.py index 30a168c3..7dc42b0e 100644 --- a/src/assets/ba_data/python/bauiv1/onscreenkeyboard.py +++ b/src/assets/ba_data/python/bauiv1/onscreenkeyboard.py @@ -51,6 +51,18 @@ class OnScreenKeyboardWindow(Window): else (0, 0), ) ) + self._cancel_button = _bauiv1.buttonwidget( + parent=self._root_widget, + scale=0.5, + position=(30, self._height - 55), + size=(60, 60), + label='', + on_activate_call=self._cancel, + autoselect=True, + color=(0.55, 0.5, 0.6), + icon=_bauiv1.gettexture('crossOut'), + iconscale=1.2, + ) self._done_button = _bauiv1.buttonwidget( parent=self._root_widget, position=(self._width - 200, 44), From 839874604d1d304d4de8628cfbf6c81f697e35cc Mon Sep 17 00:00:00 2001 From: Vishal Date: Fri, 13 Oct 2023 07:21:43 +0530 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 968333b3..8eb8e41b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ huge chunks of it and put back still-relevant pieces in a much more cleanly designed way. This should put us in a much better place for supporting various platforms and making graphical improvements going forward. - `ballistica/base/app_adapter/app_adapter_sdl.cc` for an example of the now + `ballistica/base/app_adapter/app_adapter_sdl.cc` is an example of the now nicely implemented system. - The engine now requires OpenGL 3.0 or newer on desktop and OpenGL ES 3.0 or newer on mobile. This means we're cutting off a few percent of old devices on From 32dd54303a1ff9c2781b9356dbfd7c1c0d616f91 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 15 Oct 2023 13:11:39 +0530 Subject: [PATCH 3/5] Update publictab.py --- .../ba_data/python/bauiv1lib/gather/publictab.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py index 0a9ef110..3eb8239e 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py @@ -361,6 +361,7 @@ class PublicGatherTab(GatherTab): self._last_server_list_query_time: float | None = None self._join_list_column: bui.Widget | None = None self._join_status_text: bui.Widget | None = None + self._no_servers_text: bui.Widget | None = None self._host_max_party_size_value: bui.Widget | None = None self._host_max_party_size_minus_button: (bui.Widget | None) = None self._host_max_party_size_plus_button: (bui.Widget | None) = None @@ -658,6 +659,18 @@ class PublicGatherTab(GatherTab): color=(0.6, 0.6, 0.6), position=(c_width * 0.5, c_height * 0.5), ) + self._no_servers_text = bui.textwidget( + parent=self._container, + text='', + size=(0, 0), + scale=0.9, + flatness=1.0, + shadow=0.0, + h_align='center', + v_align='top', + color=(0.6, 0.6, 0.6), + position=(c_width * 0.5, c_height * 0.5), + ) def _build_host_tab( self, region_width: float, region_height: float From a17ac19946d2b6b6b5c84c445869afcacb934c57 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 15 Oct 2023 13:16:46 +0530 Subject: [PATCH 4/5] Update publictab.py --- .../python/bauiv1lib/gather/publictab.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py index 3eb8239e..d1e57760 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py @@ -963,6 +963,10 @@ class PublicGatherTab(GatherTab): self._update_party_rows() def _update_party_rows(self) -> None: + + plus = bui.app.plus + assert plus is not None + columnwidget = self._join_list_column if not columnwidget: return @@ -976,6 +980,10 @@ class PublicGatherTab(GatherTab): edit=self._host_scrollwidget, claims_up_down=(len(self._parties_displayed) > 0), ) + bui.textwidget( + edit=self._no_servers_text, + text='' + ) # Clip if we have more UI rows than parties to show. clipcount = len(self._ui_rows) - len(self._parties_displayed) @@ -985,6 +993,15 @@ class PublicGatherTab(GatherTab): # If we have no parties to show, we're done. if not self._parties_displayed: + text = self._join_status_text + if ( + plus.get_v1_account_state() == 'signed_in' + and cast(str, bui.textwidget(query=text)) == '' + ): + bui.textwidget( + edit=self._no_servers_text, + text='No Servers Found' #bui.Lstr(resource='notSignedInText') + ) return sub_scroll_width = 830 From c4676688e83147f5c66845ea4d1329215944804b Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 15 Oct 2023 13:25:58 +0530 Subject: [PATCH 5/5] Adding Language Compatibility --- src/assets/ba_data/python/bauiv1lib/gather/publictab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py index d1e57760..20ad8e15 100644 --- a/src/assets/ba_data/python/bauiv1lib/gather/publictab.py +++ b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py @@ -1000,7 +1000,7 @@ class PublicGatherTab(GatherTab): ): bui.textwidget( edit=self._no_servers_text, - text='No Servers Found' #bui.Lstr(resource='notSignedInText') + text=bui.Lstr(resource='noServerFoundText') ) return