From 396dfcb23e001bdcb49415bc0472f752b9375419 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Mon, 28 Apr 2025 11:52:01 +0200 Subject: [PATCH] Improve drawer style --- internal_filesystem/main.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/internal_filesystem/main.py b/internal_filesystem/main.py index df11a643..9fc9c6d7 100644 --- a/internal_filesystem/main.py +++ b/internal_filesystem/main.py @@ -154,19 +154,20 @@ drawer.set_size(lv.pct(100),lv.pct(100)) drawer.set_pos(0,-TFT_VER_RES) # off screen initially drawer.set_style_bg_color(COLOR_DRAWER_BG,0) drawer.set_scroll_dir(lv.DIR.NONE) +drawer.set_style_pad_all(0, 0) add_notification_bar(drawer) +slider_label=lv.label(drawer) +slider_label.set_text(f"{SLIDER_DEFAULT_VALUE}%") +slider_label.set_style_text_color(COLOR_TEXT_WHITE,0) +slider_label.align(lv.ALIGN.TOP_MID,0,NOTIFICATION_BAR_HEIGHT+PADDING_SMALL) slider=lv.slider(drawer) slider.set_range(SLIDER_MIN_VALUE,SLIDER_MAX_VALUE) slider.set_value(SLIDER_DEFAULT_VALUE,False) slider.set_width(TFT_HOR_RES-PADDING_LARGE) -slider.align(lv.ALIGN.TOP_MID,0,NOTIFICATION_BAR_HEIGHT+PADDING_SMALL) +slider.align_to(slider_label,lv.ALIGN.OUT_BOTTOM_MID,0,PADDING_SMALL) slider.set_style_bg_color(COLOR_SLIDER_BG,lv.PART.MAIN) slider.set_style_bg_color(COLOR_SLIDER_INDICATOR,lv.PART.INDICATOR) slider.set_style_bg_color(COLOR_SLIDER_KNOB,lv.PART.KNOB) -slider_label=lv.label(drawer) -slider_label.set_text(f"{SLIDER_DEFAULT_VALUE}%") -slider_label.set_style_text_color(COLOR_TEXT_WHITE,0) -slider_label.align_to(slider,lv.ALIGN.OUT_TOP_MID,0,-5) def slider_event(e): value=slider.get_value() slider_label.set_text(f"{value}%") @@ -175,7 +176,7 @@ def slider_event(e): slider.add_event_cb(slider_event,lv.EVENT.VALUE_CHANGED,None) wifi_btn=lv.button(drawer) wifi_btn.set_size(BUTTON_WIDTH,BUTTON_HEIGHT) -wifi_btn.align(lv.ALIGN.LEFT_MID,PADDING_SMALL,0) +wifi_btn.align(lv.ALIGN.LEFT_MID,PADDING_MEDIUM,0) wifi_btn.set_style_bg_color(COLOR_DRAWER_BUTTON_BG,0) wifi_label=lv.label(wifi_btn) wifi_label.set_text(lv.SYMBOL.WIFI+" WiFi") @@ -190,7 +191,7 @@ wifi_btn.add_event_cb(wifi_event,lv.EVENT.CLICKED,None) # settings_btn=lv.button(drawer) settings_btn.set_size(BUTTON_WIDTH,BUTTON_HEIGHT) -settings_btn.align(lv.ALIGN.RIGHT_MID,-PADDING_SMALL,0) +settings_btn.align(lv.ALIGN.RIGHT_MID,-PADDING_MEDIUM,0) settings_btn.set_style_bg_color(COLOR_DRAWER_BUTTON_BG,0) settings_label=lv.label(settings_btn) settings_label.set_text(lv.SYMBOL.SETTINGS+" Settings") @@ -204,7 +205,7 @@ settings_btn.add_event_cb(settings_event,lv.EVENT.CLICKED,None) # launcher_btn=lv.button(drawer) launcher_btn.set_size(BUTTON_WIDTH,BUTTON_HEIGHT) -launcher_btn.align(lv.ALIGN.BOTTOM_LEFT,PADDING_SMALL,0) +launcher_btn.align(lv.ALIGN.BOTTOM_LEFT,PADDING_MEDIUM,-PADDING_MEDIUM) launcher_btn.set_style_bg_color(COLOR_DRAWER_BUTTON_BG,0) launcher_label=lv.label(launcher_btn) launcher_label.set_text(lv.SYMBOL.HOME+" Launcher") @@ -220,7 +221,7 @@ launcher_btn.add_event_cb(launcher_event,lv.EVENT.CLICKED,None) # restart_btn=lv.button(drawer) restart_btn.set_size(BUTTON_WIDTH,BUTTON_HEIGHT) -restart_btn.align(lv.ALIGN.BOTTOM_RIGHT,-PADDING_SMALL,0) +restart_btn.align(lv.ALIGN.BOTTOM_RIGHT,-PADDING_MEDIUM,-PADDING_MEDIUM) restart_btn.set_style_bg_color(COLOR_DRAWER_BUTTON_BG,0) restart_label=lv.label(restart_btn) restart_label.set_text(lv.SYMBOL.POWER+" Reset")