mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-19 21:37:57 +08:00
Latest public/internal sync.
This commit is contained in:
parent
7df55ecd14
commit
ffa75ac4d1
@ -48,7 +48,10 @@ class _HostLookupThread(Thread):
|
||||
try:
|
||||
import socket
|
||||
|
||||
result = [item[-1][0] for item in socket.getaddrinfo(self.name, self._port)][0]
|
||||
result = [
|
||||
item[-1][0]
|
||||
for item in socket.getaddrinfo(self.name, self._port)
|
||||
][0]
|
||||
except Exception:
|
||||
result = None
|
||||
bui.pushcall(
|
||||
@ -212,15 +215,19 @@ class ManualGatherTab(GatherTab):
|
||||
inactive_color = (0.5, 0.4, 0.5)
|
||||
bui.textwidget(
|
||||
edit=self._join_by_address_text,
|
||||
color=active_color
|
||||
if value is SubTabType.JOIN_BY_ADDRESS
|
||||
else inactive_color,
|
||||
color=(
|
||||
active_color
|
||||
if value is SubTabType.JOIN_BY_ADDRESS
|
||||
else inactive_color
|
||||
),
|
||||
)
|
||||
bui.textwidget(
|
||||
edit=self._favorites_text,
|
||||
color=active_color
|
||||
if value is SubTabType.FAVORITES
|
||||
else inactive_color,
|
||||
color=(
|
||||
active_color
|
||||
if value is SubTabType.FAVORITES
|
||||
else inactive_color
|
||||
),
|
||||
)
|
||||
|
||||
# Clear anything existing in the old sub-tab.
|
||||
@ -354,9 +361,7 @@ class ManualGatherTab(GatherTab):
|
||||
self._height = (
|
||||
578
|
||||
if uiscale is bui.UIScale.SMALL
|
||||
else 670
|
||||
if uiscale is bui.UIScale.MEDIUM
|
||||
else 800
|
||||
else 670 if uiscale is bui.UIScale.MEDIUM else 800
|
||||
)
|
||||
|
||||
self._scroll_width = self._width - 130 + 2 * x_inset
|
||||
@ -375,16 +380,12 @@ class ManualGatherTab(GatherTab):
|
||||
b_height = (
|
||||
107
|
||||
if uiscale is bui.UIScale.SMALL
|
||||
else 142
|
||||
if uiscale is bui.UIScale.MEDIUM
|
||||
else 190
|
||||
else 142 if uiscale is bui.UIScale.MEDIUM else 190
|
||||
)
|
||||
b_space_extra = (
|
||||
0
|
||||
if uiscale is bui.UIScale.SMALL
|
||||
else -2
|
||||
if uiscale is bui.UIScale.MEDIUM
|
||||
else -5
|
||||
else -2 if uiscale is bui.UIScale.MEDIUM else -5
|
||||
)
|
||||
|
||||
btnv = (
|
||||
@ -392,9 +393,7 @@ class ManualGatherTab(GatherTab):
|
||||
- (
|
||||
48
|
||||
if uiscale is bui.UIScale.SMALL
|
||||
else 45
|
||||
if uiscale is bui.UIScale.MEDIUM
|
||||
else 40
|
||||
else 45 if uiscale is bui.UIScale.MEDIUM else 40
|
||||
)
|
||||
- b_height
|
||||
)
|
||||
@ -513,9 +512,7 @@ class ManualGatherTab(GatherTab):
|
||||
scale=(
|
||||
1.8
|
||||
if uiscale is bui.UIScale.SMALL
|
||||
else 1.55
|
||||
if uiscale is bui.UIScale.MEDIUM
|
||||
else 1.0
|
||||
else 1.55 if uiscale is bui.UIScale.MEDIUM else 1.0
|
||||
),
|
||||
size=(c_width, c_height),
|
||||
transition='in_scale',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user