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

Removing a few inactive UI elements on mac build

Browse Source
This commit is contained in:
Eric Froemling 2020-07-12 19:15:18 -07:00
parent 09a3a300a2
commit 8f53e03cdb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/src/ba_data/python/bastd/ui/settings/controls.py
View File

@ -59,7 +59,7 @@ class ControlsSettingsWindow(ba.Window):
self._r = 'configControllersWindow' self._r = 'configControllersWindow'
app = ba.app app = ba.app
is_fire_tv = _ba.is_running_on_fire_tv() # is_fire_tv = _ba.is_running_on_fire_tv()
spacing = 50.0 spacing = 50.0
button_width = 350.0 button_width = 350.0
@ -110,17 +110,17 @@ class ControlsSettingsWindow(ba.Window):
show_remote = False show_remote = False
show_ps3 = False show_ps3 = False
if platform == 'mac': # if platform == 'mac':
show_ps3 = True # show_ps3 = True
height += spacing # height += spacing
show360 = False show360 = False
if platform == 'mac' or is_fire_tv: # if platform == 'mac' or is_fire_tv:
show360 = True # show360 = True
height += spacing # height += spacing
show_mac_wiimote = False show_mac_wiimote = False
if platform == 'mac': if platform == 'mac' and subplatform == 'appstore':
show_mac_wiimote = True show_mac_wiimote = True
height += spacing height += spacing
@ -135,7 +135,7 @@ class ControlsSettingsWindow(ba.Window):
# (we can run into problems where devices register as one of each # (we can run into problems where devices register as one of each
# type otherwise).. # type otherwise)..
show_mac_controller_subsystem = False show_mac_controller_subsystem = False
if platform == 'mac': if platform == 'mac' and subplatform == 'appstore':
show_mac_controller_subsystem = True show_mac_controller_subsystem = True
if show_mac_controller_subsystem: if show_mac_controller_subsystem:

4
assets/src/ba_data/python/bastd/ui/settings/keyboard.py
View File

@ -54,7 +54,7 @@ class ConfigKeyboardWindow(ba.Window):
size=(self._width, self._height), size=(self._width, self._height),
scale=(1.6 if uiscale is ba.UIScale.SMALL else scale=(1.6 if uiscale is ba.UIScale.SMALL else
1.3 if uiscale is ba.UIScale.MEDIUM else 1.0), 1.3 if uiscale is ba.UIScale.MEDIUM else 1.0),
stack_offset=(0, -10) if uiscale is ba.UIScale.SMALL else (0, 0), stack_offset=(0, 5) if uiscale is ba.UIScale.SMALL else (0, 0),
transition=transition)) transition=transition))
self._rebuild_ui() self._rebuild_ui()
@ -123,7 +123,7 @@ class ConfigKeyboardWindow(ba.Window):
color=ba.app.infotextcolor, color=ba.app.infotextcolor,
h_align='center', h_align='center',
v_align='top') v_align='top')
v -= 45 v -= 40
v -= 10 v -= 10
v -= self._spacing * 2.2 v -= self._spacing * 2.2
v += 25 v += 25