From 7f359f01b9035fd7775beb8b6fe57b44b66f4e87 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Tue, 21 Jul 2026 00:10:24 -0400 Subject: [PATCH] 144x168 alignment --- neat_bar | 2 +- resources/reset.png | Bin 119 -> 126 bytes src/c/main.c | 19 ++++++++++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/neat_bar b/neat_bar index 147a230..1f07cf7 160000 --- a/neat_bar +++ b/neat_bar @@ -1 +1 @@ -Subproject commit 147a230c977b07904551f5678fe4cc3c61afb3fa +Subproject commit 1f07cf7563955c7a58c712d7128626f84c333ac3 diff --git a/resources/reset.png b/resources/reset.png index d178b82071731a56285fd62123c71e60496b067c..b2216251b6ba4ceffb395e1e6dedf05e82cf6643 100644 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^fdq?k&A{DK)6$|j$+0P@T|T^vIy z7?Ts~4;(n~zp>HrA3Jk%FE4X*s|>RFVdQ&MBb@0RMy~nE(I) literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx?BpA#)4xIr~OeH~n!3+##lh0ZJc?O;?jv*C{ z$q(!gDEx0Y_>bAymDRbC_b{_$8~fLU6!xV02MH?@5>|LKXfbFe+cPlKz2)B+y+F4b OWTL05pUXO@geCx?MIh_| diff --git a/src/c/main.c b/src/c/main.c index 665ba62..ae416ee 100644 --- a/src/c/main.c +++ b/src/c/main.c @@ -73,16 +73,25 @@ void window_load(Window *window) { neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_SELECT, s_action_icon_plus); neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_DOWN, s_action_icon_minus); #if PBL_RECT - neat_bar_layer_set_corner_radius(s_neat_bar_layer, 3); - neat_bar_layer_set_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT - 28); - neat_bar_layer_set_y_offset(s_neat_bar_layer, 24); + neat_bar_layer_set_rect_bar_corner_radius(s_neat_bar_layer, 3); +#if PBL_DISPLAY_HEIGHT >= 228 + neat_bar_layer_set_bar_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT - 28); + neat_bar_layer_set_bar_y_offset(s_neat_bar_layer, 24); +#else + neat_bar_layer_set_bar_width(s_neat_bar_layer, ACTION_BAR_WIDTH - 10); + neat_bar_layer_set_bar_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT - 22); + neat_bar_layer_set_bar_y_offset(s_neat_bar_layer, 19); + neat_bar_layer_set_icons_x_offset(s_neat_bar_layer, 0); + neat_bar_layer_set_icons_y_offset(s_neat_bar_layer, 8); + neat_bar_layer_set_icons_spread(s_neat_bar_layer, 48); + neat_bar_layer_set_animations_move_distance(s_neat_bar_layer, 2); +#endif #endif neat_bar_layer_add_to_window(s_neat_bar_layer, window); GRect bounds = layer_get_frame(window_layer); - const int16_t width = layer_get_frame(window_layer).size.w - ACTION_BAR_WIDTH; - s_text_layer = text_layer_create(GRect(0, PBL_DISPLAY_HEIGHT / 2 - 27, width, bounds.size.h)); + s_text_layer = text_layer_create(GRect(0, PBL_DISPLAY_HEIGHT / 2 - 19, PBL_DISPLAY_WIDTH - 20, bounds.size.h)); text_layer_set_font(s_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD)); text_layer_set_background_color(s_text_layer, GColorClear); update();