Bug fixes to Checklist

pull/252/head
ZodiusInfuser 2022-02-23 11:22:25 +00:00 zatwierdzone przez Phil Howard
rodzic a346d4f2cf
commit 3f1ed1e2db
1 zmienionych plików z 6 dodań i 8 usunięć

Wyświetl plik

@ -20,10 +20,10 @@ TITLE_TEXT_SIZE = 0.7
ITEM_TEXT_SIZE = 0.6 ITEM_TEXT_SIZE = 0.6
ITEM_SPACING = 20 ITEM_SPACING = 20
LIST_START = 42 LIST_START = 40
LIST_PADDING = 2 LIST_PADDING = 2
LIST_WIDTH = WIDTH - LIST_PADDING - LIST_PADDING - ARROW_WIDTH LIST_WIDTH = WIDTH - LIST_PADDING - LIST_PADDING - ARROW_WIDTH
LIST_HEIGHT = HEIGHT - LIST_START - ARROW_HEIGHT LIST_HEIGHT = HEIGHT - LIST_START - LIST_PADDING - ARROW_HEIGHT
# ------------------------------ # ------------------------------
@ -48,9 +48,7 @@ def draw_list(items, item_states, start_item, highlighted_item, x, y, width, hei
item_y = 0 item_y = 0
current_col += 1 current_col += 1
if current_col >= columns: if current_col >= columns:
return i # Return how many items were left over return
break
return 0
# Draw a upward arrow # Draw a upward arrow
@ -159,7 +157,7 @@ list_columns = 1
while longest_item + ITEM_SPACING < (LIST_WIDTH // (list_columns + 1)): while longest_item + ITEM_SPACING < (LIST_WIDTH // (list_columns + 1)):
list_columns += 1 list_columns += 1
items_per_page = (LIST_HEIGHT // ITEM_SPACING) * list_columns items_per_page = ((LIST_HEIGHT // ITEM_SPACING) + 1) * list_columns
# Button handling function # Button handling function
@ -233,8 +231,8 @@ while True:
# Draw the list # Draw the list
display.pen(0) display.pen(0)
display.thickness(2) display.thickness(2)
items_remaining = draw_list(list_content, list_states, page_item, current_item, LIST_PADDING, LIST_START, draw_list(list_content, list_states, page_item, current_item, LIST_PADDING, LIST_START,
LIST_WIDTH, LIST_HEIGHT, ITEM_SPACING, list_columns) LIST_WIDTH, LIST_HEIGHT, ITEM_SPACING, list_columns)
# Draw the interaction button icons # Draw the interaction button icons
display.pen(0) display.pen(0)