Skip to content
Snippets Groups Projects
Commit cfe4e667 authored by Stefan Haun's avatar Stefan Haun
Browse files

Menu: Put colors in variables and use Camp CI

Might be a preparation for confiurable menu colors.
parent dc975c7b
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,10 @@ import ujson ...@@ -14,7 +14,10 @@ import ujson
import sys import sys
BUTTON_TIMER_POPPED = -1 BUTTON_TIMER_POPPED = -1
COLOR1, COLOR2 = (color.CHAOSBLUE_DARK, color.CHAOSBLUE) COLOR_BG = color.CHAOSBLUE_DARK
COLOR_BG_SEL = color.CHAOSBLUE
COLOR_ARROW = color.COMMYELLOW
COLOR_TEXT = color.COMMYELLOW
MAXCHARS = 11 MAXCHARS = 11
...@@ -166,7 +169,7 @@ def draw_menu(disp, applist, pos, appcount, lineoffset): ...@@ -166,7 +169,7 @@ def draw_menu(disp, applist, pos, appcount, lineoffset):
(i - start) * 20, (i - start) * 20,
159, 159,
(i - start) * 20 + 20, (i - start) * 20 + 20,
col=COLOR1 if i == pos else COLOR2, col=COLOR_BG_SEL if i == pos else COLOR_BG,
) )
line = app[1]["name"] line = app[1]["name"]
...@@ -186,10 +189,11 @@ def draw_menu(disp, applist, pos, appcount, lineoffset): ...@@ -186,10 +189,11 @@ def draw_menu(disp, applist, pos, appcount, lineoffset):
disp.print( disp.print(
" " + line[off : (off + (MAXCHARS - 1))], " " + line[off : (off + (MAXCHARS - 1))],
posy=(i - start) * 20, posy=(i - start) * 20,
bg=COLOR1 if i == pos else COLOR2, fg=COLOR_TEXT,
bg=COLOR_BG_SEL if i == pos else COLOR_BG,
) )
if i == pos: if i == pos:
disp.print(">", posy=(i - start) * 20, fg=color.COMMYELLOW, bg=COLOR1) disp.print(">", posy=(i - start) * 20, fg=COLOR_ARROW, bg=COLOR_BG_SEL)
if linelength > (MAXCHARS - 1) and off < linelength - (MAXCHARS - 1): if linelength > (MAXCHARS - 1) and off < linelength - (MAXCHARS - 1):
triangle(disp, 153, (i - start) * 20 + 6, False, 6) triangle(disp, 153, (i - start) * 20 + 6, False, 6)
...@@ -215,21 +219,9 @@ def main(): ...@@ -215,21 +219,9 @@ def main():
timercountpopped = 0 timercountpopped = 0
for ev in button_events(10): for ev in button_events(10):
if numapps == 0: if numapps == 0:
disp.clear(color.COMMYELLOW) disp.clear(COLOR_BG)
disp.print( disp.print(" No apps ", posx=17, posy=20, fg=COLOR_TEXT, bg=COLOR_BG)
" No apps ", disp.print("available", posx=17, posy=40, fg=COLOR_TEXT, bg=COLOR_BG)
posx=17,
posy=20,
fg=color.COMMYELLOW_DARK,
bg=color.COMMYELLOW,
)
disp.print(
"available",
posx=17,
posy=40,
fg=color.COMMYELLOW_DARK,
bg=color.COMMYELLOW,
)
disp.update() disp.update()
continue continue
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment