From c5abbee0dac80bc58ca697418068b630364512a7 Mon Sep 17 00:00:00 2001 From: Lennart Jahn Date: Tue, 4 Jun 2024 21:52:56 +0200 Subject: [PATCH] move date 1 px --- src/displayapp/screens/WatchFaceStarTrek.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/displayapp/screens/WatchFaceStarTrek.cpp b/src/displayapp/screens/WatchFaceStarTrek.cpp index 935c6a79f5..b42a507622 100644 --- a/src/displayapp/screens/WatchFaceStarTrek.cpp +++ b/src/displayapp/screens/WatchFaceStarTrek.cpp @@ -133,6 +133,7 @@ void WatchFaceStarTrek::drawWatchFace(bool visible) { // with the future vision to make this all canvas size independent :) // -- list for date and stuff constexpr uint8_t gap = 3; + constexpr uint8_t labelgap = 4; constexpr uint8_t cellheight = 26; constexpr uint8_t cellwidth = 72; constexpr uint8_t cells_x = 34; @@ -218,10 +219,10 @@ void WatchFaceStarTrek::drawWatchFace(bool visible) { bleIcon = label(visible, COLOR_ICONS, listItem3[1], LV_ALIGN_CENTER, -gap, 0, Symbols::bluetooth); batteryPlug = label(visible, COLOR_ICONS, listItem4[1], LV_ALIGN_CENTER, -gap, 0, Symbols::plug); - label_dayname = label(visible, COLOR_DATE, listItem1[0], LV_ALIGN_IN_LEFT_MID, gap); - label_day = label(visible, COLOR_DATE, listItem2[0], LV_ALIGN_IN_LEFT_MID, gap); - label_month = label(visible, COLOR_DATE, listItem3[0], LV_ALIGN_IN_LEFT_MID, gap); - label_year = label(visible, COLOR_DATE, listItem4[0], LV_ALIGN_IN_LEFT_MID, gap); + label_dayname = label(visible, COLOR_DATE, listItem1[0], LV_ALIGN_IN_LEFT_MID, labelgap); + label_day = label(visible, COLOR_DATE, listItem2[0], LV_ALIGN_IN_LEFT_MID, labelgap); + label_month = label(visible, COLOR_DATE, listItem3[0], LV_ALIGN_IN_LEFT_MID, labelgap); + label_year = label(visible, COLOR_DATE, listItem4[0], LV_ALIGN_IN_LEFT_MID, labelgap); hourAnchor = lv_label_create(lv_scr_act(), nullptr); lv_label_set_text_static(hourAnchor, ""); @@ -239,10 +240,10 @@ void WatchFaceStarTrek::drawWatchFace(bool visible) { label_time_seconds = label(settingsController.GetStarTrekDisplaySeconds(), COLOR_TIME, minuteAnchor, LV_ALIGN_CENTER, 0, 46, "00"); label_time_ampm = label(visible, COLOR_DATE, upperShape[2], LV_ALIGN_IN_BOTTOM_RIGHT, -30, -30); - temperature = label(visible, COLOR_DATE, upperShape[1], LV_ALIGN_IN_BOTTOM_LEFT, gap, -2); - weatherIcon = label(visible, COLOR_ICONS, temperature, LV_ALIGN_OUT_TOP_LEFT, 0, -gap); + temperature = label(visible, COLOR_DATE, upperShape[1], LV_ALIGN_IN_BOTTOM_LEFT, labelgap, -2); + weatherIcon = label(visible, COLOR_ICONS, temperature, LV_ALIGN_OUT_TOP_LEFT, gap, -gap); lv_obj_set_style_local_text_font(weatherIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &fontawesome_weathericons); - heartbeatIcon = label(visible, COLOR_HEARTBEAT_OFF, lowerShape[3], LV_ALIGN_IN_TOP_LEFT, 5, gap, Symbols::heartBeat); + heartbeatIcon = label(visible, COLOR_HEARTBEAT_OFF, lowerShape[3], LV_ALIGN_IN_TOP_LEFT, 6, gap, Symbols::heartBeat); heartbeatValue = label(visible, COLOR_ICONS, heartbeatIcon, LV_ALIGN_OUT_RIGHT_MID, 5); stepIcon = label(visible, COLOR_STEPS, imgBracketLeft, LV_ALIGN_OUT_RIGHT_MID, -2, 0, Symbols::shoe); stepValue = label(visible, COLOR_STEPS, stepIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0, "0");