mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-10-28 00:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Keep offset sign previews within the visible canvas

Browse Source
This commit is contained in:
firestar5683
2026-10-22 19:57:34 -05:00
parent 0852af76e3
commit 2c352b90b4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openpilot/starpilot/ui/layout_preview_renderer.py
+5 -2
View File
@@ -340,8 +340,9 @@ class _Canvas:
for key in RUNTIME_PREVIEW_WIDGETS[str(self.profile)]:
logical_width, logical_height = widget_size(state.customization, self.profile, key)
# The restored compact US sign adds an offset row beyond its saved base size.
if (self.profile == Profile.COMPACT and key == 'speed_limit' and
not state.appearance.use_vienna_sign and resolve_unified_speed(state).offset_text):
compact_offset = (self.profile == Profile.COMPACT and key == 'speed_limit' and
not state.appearance.use_vienna_sign and bool(resolve_unified_speed(state).offset_text))
if compact_offset:
logical_height += 44
position = positions[key]
widget = PROFILES[str(self.profile)]['widgets'][key]
@@ -349,6 +350,8 @@ class _Canvas:
crop_y = max(0, math.floor(position['y'] - widget.get('visualInsetTop', 0)))
offset_x, offset_y = crop_x - position['x'], crop_y - position['y']
width, height = math.ceil(logical_width - offset_x), math.ceil(logical_height - offset_y)
if compact_offset and 0 <= crop_y < canvas_height:
height = min(height, canvas_height - crop_y)
if x + width > 1024:
x, y, row_height = 0, y + row_height, 0
sprites[key] = {'x': x, 'y': y, 'width': width, 'height': height, 'offsetX': offset_x, 'offsetY': offset_y}
openpilot/starpilot/ui/tests/test_dinish_speed.py
+5 -2
View File
@@ -238,9 +238,10 @@ def test_compact_preview_sprite_keeps_the_sign_offset_arrow_and_override_cross()
rl.init_window(128, 128, 'SLC preview crop fixture')
canvas = _Canvas(Profile.COMPACT)
try:
for y, scene in product((20, 0), ('slc_pending', 'slc_retained')):
for y, scene in product((20, 0, 64, 108), ('slc_pending', 'slc_retained')):
document = default_document()
document['layouts']['compact']['speed_limit']['y'] = y
assert validate_document(document)['layouts']['compact']['speed_limit']['y'] == y
with patch.dict('openpilot.starpilot.ui.layout_preview_renderer.RUNTIME_PREVIEW_WIDGETS', compact=('speed_limit',)):
png = canvas.render_widget_art(sample_state(scene, document), document['layouts']['compact'])
with Image.open(io.BytesIO(png)) as sheet:
@@ -256,7 +257,9 @@ def test_compact_preview_sprite_keeps_the_sign_offset_arrow_and_override_cross()
rl.unload_image(image)
assert np.array_equal(direct[..., 3], np.asarray(rebuilt)[..., 3])
assert slot['offsetX'] == slot['offsetY'] == 0
assert (slot['width'], slot['height']) == (118, 176)
assert (slot['width'], slot['height']) == (118, min(176, Profile.COMPACT.size[1] - y))
if scene == 'slc_retained':
assert np.any(direct[..., 3]), (y, scene)
finally:
canvas.close()
if owns_context: