mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-27 09:23:12 +08:00
Fixing a few bugs
This commit is contained in:
Vishal
GitHub
parent
cf0696a2ec
commit
46573c0ebc
@ -396,7 +396,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
bui.buttonwidget(
|
||||
parent=rootc,
|
||||
color=(0.45, 0.4, 0.5),
|
||||
position=(160, v_offs + 480),
|
||||
position=(160, v_offs + 439),
|
||||
size=(350, 62),
|
||||
label=(
|
||||
bui.Lstr(resource='tournamentStandingsText')
|
||||
@ -489,8 +489,8 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
|
||||
x_offs_extra = 0 if show_next_button else -100
|
||||
self._corner_button_offs = (
|
||||
h_offs + 300.0 + 100.0 + x_offs_extra,
|
||||
v_offs + 560.0,
|
||||
h_offs + 300.0 + x_offs_extra,
|
||||
v_offs + 519.0,
|
||||
)
|
||||
|
||||
if env.demo or env.arcade:
|
||||
@ -499,7 +499,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
else:
|
||||
self._league_rank_button = LeagueRankButton(
|
||||
parent=rootc,
|
||||
position=(h_offs + 300 + 100 + x_offs_extra, v_offs + 560),
|
||||
position=(h_offs + 300 + x_offs_extra, v_offs + 519),
|
||||
size=(100, 60),
|
||||
scale=0.9,
|
||||
color=(0.4, 0.4, 0.9),
|
||||
@ -509,7 +509,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
)
|
||||
self._store_button_instance = StoreButton(
|
||||
parent=rootc,
|
||||
position=(h_offs + 400 + 100 + x_offs_extra, v_offs + 560),
|
||||
position=(h_offs + 400 + x_offs_extra, v_offs + 519),
|
||||
show_tickets=True,
|
||||
sale_scale=0.85,
|
||||
size=(100, 60),
|
||||
@ -536,9 +536,8 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
)
|
||||
|
||||
def _update_corner_button_positions(self) -> None:
|
||||
offs = -55 if bui.is_party_icon_visible() else 0
|
||||
assert self._corner_button_offs is not None
|
||||
pos_x = self._corner_button_offs[0] + offs
|
||||
pos_x = self._corner_button_offs[0]
|
||||
pos_y = self._corner_button_offs[1]
|
||||
if self._league_rank_button is not None:
|
||||
self._league_rank_button.set_position((pos_x, pos_y))
|
||||
@ -716,7 +715,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
color=(0.5, 1, 0.5, 1),
|
||||
h_align='center',
|
||||
scale=0.4,
|
||||
position=(0, 292),
|
||||
position=(0, 255),
|
||||
jitter=1.0,
|
||||
).autoretain()
|
||||
Text(
|
||||
@ -1277,7 +1276,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
),
|
||||
position=(
|
||||
ts_h_offs - 35 + 95,
|
||||
ts_height / 2 + 6 + v_offs,
|
||||
ts_height / 2 + 6 + v_offs - 41,
|
||||
),
|
||||
color=(0.4, 0.4, 0.4, 1.0),
|
||||
scale=0.7,
|
||||
@ -1344,7 +1343,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
ts_height / 2
|
||||
+ -ts_height * (i + 1) / 10
|
||||
+ v_offs
|
||||
+ 11.0,
|
||||
- 30.0,
|
||||
),
|
||||
h_align=Text.HAlign.RIGHT,
|
||||
v_align=Text.VAlign.CENTER,
|
||||
@ -1361,7 +1360,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
|
||||
+ -ts_height * (i + 1) / 10
|
||||
+ v_offs_names
|
||||
+ v_offs
|
||||
+ 11.0,
|
||||
- 30.0,
|
||||
),
|
||||
maxwidth=80.0 + 100.0 * len(self._playerinfos),
|
||||
v_align=Text.VAlign.CENTER,
|
||||
|
||||
@ -132,7 +132,7 @@ class AdvancedSettingsWindow(bui.MainWindow):
|
||||
self._height - (57 if uiscale is bui.UIScale.SMALL else 40),
|
||||
),
|
||||
size=(0, 0),
|
||||
scale=0.5 if uiscale is bui.UIScale.SMALL else 1.0,
|
||||
scale=0.65 if uiscale is bui.UIScale.SMALL else 1.0,
|
||||
text=bui.Lstr(resource=f'{self._r}.titleText'),
|
||||
color=app.ui_v1.title_color,
|
||||
h_align='center',
|
||||
|
||||
@ -162,7 +162,9 @@ class ControlsSettingsWindow(bui.MainWindow):
|
||||
|
||||
bui.textwidget(
|
||||
parent=self._root_widget,
|
||||
position=(0, height - 49 + yoffs),
|
||||
position=(0, height + yoffs - (
|
||||
75 if uiscale is bui.UIScale.SMALL else 50)
|
||||
),
|
||||
size=(width, 25),
|
||||
text=bui.Lstr(resource=f'{self._r}.titleText'),
|
||||
color=bui.app.ui_v1.title_color,
|
||||
@ -310,7 +312,8 @@ class ControlsSettingsWindow(bui.MainWindow):
|
||||
|
||||
xinput_checkbox = bui.checkboxwidget(
|
||||
parent=self._root_widget,
|
||||
position=(100, v + 3),
|
||||
position=(width * (
|
||||
0.35 if uiscale is bui.UIScale.SMALL else 0.25), v + 3),
|
||||
size=(120, 30),
|
||||
value=(not bui.get_low_level_config_value('enablexinput', 1)),
|
||||
maxwidth=200,
|
||||
|
||||
@ -47,20 +47,26 @@ class TouchscreenSettingsWindow(bui.MainWindow):
|
||||
origin_widget=origin_widget,
|
||||
)
|
||||
|
||||
btn = bui.buttonwidget(
|
||||
parent=self._root_widget,
|
||||
position=(55, self._height - 60),
|
||||
size=(120, 60),
|
||||
label=bui.Lstr(resource='backText'),
|
||||
button_type='back',
|
||||
scale=0.8,
|
||||
on_activate_call=self._back,
|
||||
)
|
||||
if uiscale is bui.UIScale.SMALL:
|
||||
bui.containerwidget(
|
||||
edit=self._root_widget, on_cancel_call=self.main_window_back
|
||||
)
|
||||
btn = None
|
||||
else:
|
||||
btn = bui.buttonwidget(
|
||||
parent=self._root_widget,
|
||||
position=(55, self._height - 60),
|
||||
size=(120, 60),
|
||||
label=bui.Lstr(resource='backText'),
|
||||
button_type='back',
|
||||
scale=0.8,
|
||||
on_activate_call=self.main_window_back
|
||||
)
|
||||
bui.containerwidget(edit=self._root_widget, cancel_button=btn)
|
||||
|
||||
bui.textwidget(
|
||||
parent=self._root_widget,
|
||||
position=(25, self._height - 50),
|
||||
position=(25, self._height - 62),
|
||||
size=(self._width, 25),
|
||||
text=bui.Lstr(resource=f'{self._r}.titleText'),
|
||||
color=bui.app.ui_v1.title_color,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user