From 01aa8a48b99a88b8589801053c23805e13ab9c92 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 19 Mar 2026 00:26:07 -0400 Subject: [PATCH] Fix font scaling issues; prepare date to be moved depending on time width --- package.json | 3 ++- resources/fonts/RetroComputerTime.ttf | Bin 3084 -> 9108 bytes src/c/main.c | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index ba11e97..d70584d 100644 --- a/package.json +++ b/package.json @@ -572,8 +572,9 @@ "type": "bitmap" }, { + "characterRegex": "[:0-9]", "file": "fonts/RetroComputerTime.ttf", - "name": "FONT_RETRO_COMPUTER_32", + "name": "FONT_RETRO_COMPUTER_34", "targetPlatforms": [ "emery", "gabbro" diff --git a/resources/fonts/RetroComputerTime.ttf b/resources/fonts/RetroComputerTime.ttf index 8c471f150e78c906506e1c87f4748f0c537c3d91..7e7b17fcccdfeb204c9776cd7db865231f816761 100644 GIT binary patch literal 9108 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 W{=Yl{-}?nmzB{RlrN{puu>TA4b{u;E delta 1224 zcmZvb*=rL~6vn?hlgZM=7(s2ctxl>!(a@xWYbjbcR47^%L_x4)JGQ~38PX|jrCJ4F z+)x=2eX+ccNctc1(!d-x-RV_Cy>RCK&b{ZH`OX>U+=i3sF$e&0 z9EOhkmhCxf^n3psKrH8JS9i&F7aY&Lp#O}vx7QwUt5rrK5#oKcw>Yxz%9T5#fZj#( z`W(Aw`i^_wcsD^?+Q)VJ3-sHIG!CFkUa+Bgt?3>Yc5Jm6Iq;ye|+f^i|fw zyQhbK;2^Wt8~5o(p~+J&=0q?2SVv9ayV4J@4@yb=wNk-Jiee)EHN95XjYoc)SgE1a z9~E`egq(m}+6vkPHM|!2G5VZNVD+lvZhCwj>x9tGy(W+$g_vl?IOi!>19AZ~vihXj z9b`=Q5{P94>x%F%hr6sG?awub>GJ)5tdJ3oL}NAa#FXSz|7_^A(D_`GZbApTaFpNa zF}?^>w2NVJS=@%7OEz489owa|mDysY>H)B@Pq9D}Hx+A$;HhFAbz-LC5R#%(v4O0( zr8tZ!nx;5{CT*|cD8kxB#WC_#2suhQEK9Fb7jewc4=7HMC*)v5F-G;!CRuRI7Zqz1 z`arRcrFf}0gnD5qHn3CdQ5~x$E%dhwdImK=s6W&8yxgv5JlLKuG2eMv@0@r8B;cyb(4vy zzZ3mSnOO}cR>Nglf$1i{kcDip=h1>C{>RL`o!H@21`6eVv!ywoH&?rrLeaFWtZC(2 zmSoLBf59u*MYG}*9eco;RO7K=8Ea`J79WI1g@G~(|E)V{uA^}=)s34?i-1l>c^JWd z_JK~v8`&@S{~Z1^ma)d{%s$U^TXVUgp`m6s$ZhT}m*Dd%{r@ZI{?*305&i}IeYBsP C_tPW* diff --git a/src/c/main.c b/src/c/main.c index 990b28c..f9deb77 100644 --- a/src/c/main.c +++ b/src/c/main.c @@ -197,21 +197,21 @@ static void main_window_load(Window *window) { bitmap_layer_set_bitmap(s_guy_butt_layer, s_butt_current); // format time layer - s_time_layer = text_layer_create(GRect(0, PBL_IF_ROUND_ELSE(110, 94), PBL_IF_ROUND_ELSE(260, 200), 32)); + s_time_layer = text_layer_create(GRect(0, PBL_IF_ROUND_ELSE(109, 93), PBL_IF_ROUND_ELSE(260, 200), 34)); text_layer_set_background_color(s_time_layer, GColorClear); text_layer_set_font(s_time_layer, s_custom_font); text_layer_set_text_alignment(s_time_layer, GTextAlignmentCenter); // format date layer - s_date_layer = text_layer_create(GRect(PBL_IF_ROUND_ELSE(20, 6), PBL_IF_ROUND_ELSE(120, 104), PBL_IF_ROUND_ELSE(260, 200), 14)); + s_date_layer = text_layer_create(GRect(0, PBL_IF_ROUND_ELSE(121, 105), PBL_IF_ROUND_ELSE(69, 39), 14)); text_layer_set_background_color(s_date_layer, GColorClear); text_layer_set_font(s_date_layer, fonts_get_system_font(FONT_KEY_GOTHIC_14)); - text_layer_set_text_alignment(s_date_layer, GTextAlignmentLeft); + text_layer_set_text_alignment(s_date_layer, GTextAlignmentCenter); // create time bar layer - GRect time_bar_frame = GRect(0, PBL_IF_ROUND_ELSE(115, 99), PBL_IF_ROUND_ELSE(260, 200), 30); - s_time_bar_layer = layer_create(time_bar_frame); + s_time_bar_layer = layer_create(GRect(0, PBL_IF_ROUND_ELSE(115, 99), PBL_IF_ROUND_ELSE(260, 200), 30)); layer_set_update_proc(s_time_bar_layer, time_bar_update_proc); + text_layer_set_text_alignment(s_date_layer, GTextAlignmentCenter); // add layers as children to window layer_add_child(window_layer, bitmap_layer_get_layer(s_guy_head_layer)); @@ -273,7 +273,7 @@ static void init() { s_random_color_next = s_dark_bg_colors[rand() % s_color_count]; // load custom font - s_custom_font = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_RETRO_COMPUTER_32)); + s_custom_font = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_RETRO_COMPUTER_34)); // show the Window on the watch, with animated=true window_stack_push(s_main_window, true);