From 2d47679212bd8d1acd8cba4f8654a957d0d54d98 Mon Sep 17 00:00:00 2001 From: liamcharger Date: Sat, 6 Apr 2024 07:15:17 +1030 Subject: [PATCH] Minor improvements --- src/displayapp/screens/WatchFaceNumerals.cpp | 8 ++++---- src/resources/fonts.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/displayapp/screens/WatchFaceNumerals.cpp b/src/displayapp/screens/WatchFaceNumerals.cpp index 1afe4f1c..01e860df 100644 --- a/src/displayapp/screens/WatchFaceNumerals.cpp +++ b/src/displayapp/screens/WatchFaceNumerals.cpp @@ -31,8 +31,8 @@ WatchFaceNumerals::WatchFaceNumerals(Controllers::DateTime& dateTimeController, notificationIcon = lv_obj_create(lv_scr_act(), nullptr); lv_obj_set_style_local_bg_color(notificationIcon, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA); lv_obj_set_style_local_radius(notificationIcon, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE); - lv_obj_set_size(notificationIcon, 14, 14); - lv_obj_align(notificationIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 2, -72); + lv_obj_set_size(notificationIcon, 16, 16); + lv_obj_align(notificationIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 4, -76); lv_obj_set_hidden(notificationIcon, true); labelTimeHour = lv_label_create(lv_scr_act(), nullptr); @@ -49,7 +49,7 @@ WatchFaceNumerals::WatchFaceNumerals(Controllers::DateTime& dateTimeController, lv_label_set_text_static(labelTimeAMPM1, ""); lv_obj_set_style_local_text_font(labelTimeAMPM1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_small); lv_obj_set_style_local_text_color(labelTimeAMPM1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); - lv_obj_align(labelTimeAMPM1, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, -32); + lv_obj_align(labelTimeAMPM1, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 2, -34); labelTimeAMPM2 = lv_label_create(lv_scr_act(), nullptr); lv_label_set_text_static(labelTimeAMPM2, "M"); @@ -67,7 +67,7 @@ WatchFaceNumerals::WatchFaceNumerals(Controllers::DateTime& dateTimeController, lv_obj_set_style_local_text_color(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); lv_label_set_text(dateDay, "--"); lv_obj_set_style_local_text_font(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_small); - lv_obj_align(dateDay, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 34); + lv_obj_align(dateDay, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 36); taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this); Refresh(); diff --git a/src/resources/fonts.json b/src/resources/fonts.json index ef186257..a1135e88 100644 --- a/src/resources/fonts.json +++ b/src/resources/fonts.json @@ -79,7 +79,7 @@ } ], "bpp": 1, - "size": 30, + "size": 34, "format": "bin", "target_path": "/fonts/" }