Skip to content

Commit d5aa2af

Browse files
Don't open bar if already open
1 parent c243bb4 commit d5aa2af

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

internal_filesystem/main.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
drawer=None
4646
wifi_screen=None
4747
drawer_open=False
48+
bar_open=True
4849

4950

5051
rootscreen = lv.screen_active()
@@ -55,7 +56,7 @@
5556
def open_drawer():
5657
global drawer_open
5758
if not drawer_open:
58-
show_bar_animation.start()
59+
open_bar()
5960
drawer_open=True
6061
drawer.remove_flag(lv.obj.FLAG.HIDDEN)
6162

@@ -65,7 +66,19 @@ def close_drawer(to_launcher=False):
6566
drawer_open=False
6667
drawer.add_flag(lv.obj.FLAG.HIDDEN)
6768
if not to_launcher:
68-
hide_bar_animation.start()
69+
close_bar()
70+
71+
def open_bar():
72+
global bar_open
73+
if not bar_open:
74+
bar_open=True
75+
show_bar_animation.start()
76+
77+
def close_bar():
78+
global bar_open
79+
if bar_open:
80+
bar_open=False
81+
hide_bar_animation.start()
6982

7083

7184
# Create notification bar
@@ -144,7 +157,6 @@ def update_memfree(timer):
144157
timer2 = lv.timer_create(update_temperature, TEMPERATURE_UPDATE_INTERVAL, None)
145158
timer3 = lv.timer_create(update_memfree, MEMFREE_UPDATE_INTERVAL, None)
146159
timer4 = lv.timer_create(update_wifi_icon, WIFI_ICON_UPDATE_INTERVAL, None)
147-
#notification_bar.add_event_cb(toggle_drawer, lv.EVENT.CLICKED, None)
148160

149161
# hide bar animation
150162
hide_bar_animation = lv.anim_t()
@@ -174,7 +186,7 @@ def update_memfree(timer):
174186
slider_label=lv.label(drawer)
175187
slider_label.set_text(f"{SLIDER_DEFAULT_VALUE}%")
176188
slider_label.set_style_text_color(COLOR_TEXT_WHITE,0)
177-
slider_label.align(lv.ALIGN.TOP_MID,0,NOTIFICATION_BAR_HEIGHT+PADDING_SMALL)
189+
slider_label.align(lv.ALIGN.TOP_MID,0,PADDING_SMALL)
178190
slider=lv.slider(drawer)
179191
slider.set_range(SLIDER_MIN_VALUE,SLIDER_MAX_VALUE)
180192
slider.set_value(SLIDER_DEFAULT_VALUE,False)
@@ -359,9 +371,9 @@ def start_app(app_dir, is_launcher=False):
359371
execute_script_new_thread(start_script_fullpath, True, is_launcher, True)
360372
# Launchers have the bar, other apps don't have it
361373
if is_launcher:
362-
show_bar_animation.start()
374+
open_bar()
363375
else:
364-
hide_bar_animation.start()
376+
close_bar()
365377

366378
def restart_launcher():
367379
# The launcher might have been updated from the builtin one, so check that:

0 commit comments

Comments
 (0)