Support 4:3 aspect ratio with FRUIT_JAM_OS_4x3 environment variable

This commit is contained in:
Cooper Dalrymple 2025-08-05 08:39:47 -05:00
parent 8b5b975ed6
commit 9bcfe9f97c
2 changed files with 22 additions and 6 deletions

View file

@ -9,6 +9,7 @@ import atexit
import json import json
import math import math
import displayio import displayio
import os
import supervisor import supervisor
import sys import sys
import terminalio import terminalio
@ -52,7 +53,13 @@ if args is not None and len(args) > 0:
print(f"launching: {next_code_file}") print(f"launching: {next_code_file}")
supervisor.reload() supervisor.reload()
request_display_config(720, 400) # read environment variables
aspect_ratio_4x3 = os.getenv("FRUIT_JAM_OS_4x3", 0)
if aspect_ratio_4x3:
request_display_config(640, 480)
else:
request_display_config(720, 400)
display = supervisor.runtime.display display = supervisor.runtime.display
scale = 1 scale = 1
@ -135,8 +142,12 @@ if "use_mouse" in launcher_config and launcher_config["use_mouse"]:
mouse_buf = array.array("b", [0] * 8) mouse_buf = array.array("b", [0] * 8)
WIDTH = 280 if aspect_ratio_4x3:
HEIGHT = 182 WIDTH = 248
HEIGHT = 218
else:
WIDTH = 280
HEIGHT = 182
config = { config = {
"menu_title": "Launcher Menu", "menu_title": "Launcher Menu",
@ -177,10 +188,13 @@ config = {
} }
cell_width = WIDTH // config["width"] cell_width = WIDTH // config["width"]
cell_height = HEIGHT // config["height"]
default_icon_bmp, default_icon_palette = adafruit_imageload.load("launcher_assets/default_icon.bmp") default_icon_bmp, default_icon_palette = adafruit_imageload.load("launcher_assets/default_icon.bmp")
default_icon_palette.make_transparent(0) default_icon_palette.make_transparent(0)
menu_grid = GridLayout(x=40, y=16, width=WIDTH, height=HEIGHT, grid_size=(config["width"], config["height"]), menu_grid = GridLayout(x=(display.width // scale - WIDTH) // 2,
y=(display.height // scale - HEIGHT) // 2,
width=WIDTH, height=HEIGHT, grid_size=(config["width"], config["height"]),
divider_lines=False) divider_lines=False)
scaled_group.append(menu_grid) scaled_group.append(menu_grid)
@ -267,8 +281,9 @@ def _create_cell_group(app):
cell_group.append(icon_tg) cell_group.append(icon_tg)
icon_tg.x = cell_width // 2 - icon_tg.tile_width // 2 icon_tg.x = cell_width // 2 - icon_tg.tile_width // 2
title_txt = TextBox(font, text=app["title"], width=WIDTH // config["width"], height=18, title_txt = TextBox(font, text=app["title"], width=cell_width, height=18,
align=TextBox.ALIGN_CENTER) align=TextBox.ALIGN_CENTER)
icon_tg.y = (cell_height - icon_tg.tile_height - title_txt.height) // 2
cell_group.append(title_txt) cell_group.append(title_txt)
title_txt.anchor_point = (0, 0) title_txt.anchor_point = (0, 0)
title_txt.anchored_position = (0, icon_tg.y + icon_tg.tile_height) title_txt.anchored_position = (0, icon_tg.y + icon_tg.tile_height)
@ -288,7 +303,7 @@ def _reuse_cell_group(app, cell_group):
icon_tg.pixel_shader = icon_palette icon_tg.pixel_shader = icon_palette
icon_tg.x = cell_width // 2 - icon_tg.tile_width // 2 icon_tg.x = cell_width // 2 - icon_tg.tile_width // 2
# title_txt = TextBox(font, text=app["title"], width=WIDTH // config["width"], height=18, # title_txt = TextBox(font, text=app["title"], width=cell_width, height=18,
# align=TextBox.ALIGN_CENTER) # align=TextBox.ALIGN_CENTER)
# cell_group.append(title_txt) # cell_group.append(title_txt)
title_txt = cell_group[1] title_txt = cell_group[1]

View file

@ -1 +1,2 @@
CIRCUITPY_PYSTACK_SIZE=4000 CIRCUITPY_PYSTACK_SIZE=4000
# FRUIT_JAM_OS_4x3=1