michi/zmk
1
0
Fork 0
mirror of https://github.com/zmkfirmware/zmk.git synced 2026-05-03 04:43:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(display): Saner font selection/defaults.

Browse Source 
* Only select fonts for the default built in status screen
* Leverage theme default fonts, instead of hardcoding theme
  details in each component.
This commit is contained in:
Peter Johanson
2021-04-01 21:22:48 -04:00
committed by Pete Johanson
parent 2128b2b55f
commit 3e6a3758ed
7 changed files with 23 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/display/widgets/battery_status.c
-18
View File
@@ -18,22 +18,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/events/battery_state_changed.h>
static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);
static lv_style_t label_style;
static bool style_initialized = false;
void battery_status_init() {
if (style_initialized) {
return;
}
style_initialized = true;
lv_style_init(&label_style);
lv_style_set_text_color(&label_style, LV_STATE_DEFAULT, LV_COLOR_BLACK);
lv_style_set_text_font(&label_style, LV_STATE_DEFAULT, &lv_font_montserrat_16);
lv_style_set_text_letter_space(&label_style, LV_STATE_DEFAULT, 1);
lv_style_set_text_line_space(&label_style, LV_STATE_DEFAULT, 1);
}
struct battery_status_state {
uint8_t level;
@@ -90,9 +74,7 @@ ZMK_SUBSCRIPTION(widget_battery_status, zmk_usb_conn_state_changed);
#endif /* IS_ENABLED(CONFIG_USB) */
int zmk_widget_battery_status_init(struct zmk_widget_battery_status *widget, lv_obj_t *parent) {
battery_status_init();
widget->obj = lv_label_create(parent, NULL);
lv_obj_add_style(widget->obj, LV_LABEL_PART_MAIN, &label_style);
lv_obj_set_size(widget->obj, 40, 15);