djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8300 from pypewpew/no-logo-fix 

Fix displayio when CIRCUITPY_REPL_LOGO is disabled
This commit is contained in:
Dan Halbert 2023-08-19 20:39:44 -04:00 committed by GitHub
parent babd2dec45 b93b1d0e75
commit 506dca71b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/shared/display.c
View File

@ -128,10 +128,8 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
status_bar->full_change = true;
scroll_area->width_in_tiles = width_in_tiles;
scroll_area->height_in_tiles = height_in_tiles;
#if CIRCUITPY_REPL_LOGO
scroll_area->height_in_tiles -= 1;
#endif
// Leave space for the status bar, no matter if we have logo or not.
scroll_area->height_in_tiles = height_in_tiles - 1;
scroll_area->pixel_width = scroll_area->width_in_tiles * scroll_area->tile_width;
scroll_area->pixel_height = scroll_area->height_in_tiles * scroll_area->tile_height;
// Right align the scroll area to give margin to the start of each line.

2
tools/ci_set_matrix.py
View File

@ -195,7 +195,7 @@ def set_boards(build_all: bool):
# Check supervisor files
# This is useful for limiting workflow changes to the relevant boards
if file.startswith("supervisor"):
if file in settings["SRC_SUPERVISOR"]:
if file in settings.get("SRC_SUPERVISOR", ""):
boards_to_build.add(board)
continue