200x228 alignment

This commit is contained in:
2026-07-21 00:30:41 -04:00
parent 7f359f01b9
commit d4d191a2bb
+17 -3
View File
@@ -73,15 +73,17 @@ 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_SELECT, s_action_icon_plus);
neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_DOWN, s_action_icon_minus); neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_DOWN, s_action_icon_minus);
#if PBL_RECT #if PBL_RECT
neat_bar_layer_set_icons_x_offset(s_neat_bar_layer, 0);
neat_bar_layer_set_rect_bar_corner_radius(s_neat_bar_layer, 3); neat_bar_layer_set_rect_bar_corner_radius(s_neat_bar_layer, 3);
#if PBL_DISPLAY_HEIGHT >= 228 #if PBL_DISPLAY_HEIGHT >= 228
neat_bar_layer_set_bar_width(s_neat_bar_layer, ACTION_BAR_WIDTH - 6);
neat_bar_layer_set_bar_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT - 28); 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); neat_bar_layer_set_bar_y_offset(s_neat_bar_layer, 24);
neat_bar_layer_set_icons_y_offset(s_neat_bar_layer, 10);
#else #else
neat_bar_layer_set_bar_width(s_neat_bar_layer, ACTION_BAR_WIDTH - 10); 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_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_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_y_offset(s_neat_bar_layer, 8);
neat_bar_layer_set_icons_spread(s_neat_bar_layer, 48); neat_bar_layer_set_icons_spread(s_neat_bar_layer, 48);
neat_bar_layer_set_animations_move_distance(s_neat_bar_layer, 2); neat_bar_layer_set_animations_move_distance(s_neat_bar_layer, 2);
@@ -89,9 +91,21 @@ void window_load(Window *window) {
#endif #endif
neat_bar_layer_add_to_window(s_neat_bar_layer, window); neat_bar_layer_add_to_window(s_neat_bar_layer, window);
GRect bounds = layer_get_frame(window_layer); #if PBL_DISPLAY_HEIGHT >= 260
#define W_OFFSET 20 // TODO
#define Y_OFFSET 19 // TODO
#elif PBL_DISPLAY_HEIGHT >= 228
#define W_OFFSET 28
#define Y_OFFSET 17
#elif PBL_DISPLAY_HEIGHT >= 180
#define W_OFFSET 20 // TODO
#define Y_OFFSET 19 // TODO
#else // 144x168
#define W_OFFSET 20
#define Y_OFFSET 19
#endif
s_text_layer = text_layer_create(GRect(0, PBL_DISPLAY_HEIGHT / 2 - 19, PBL_DISPLAY_WIDTH - 20, bounds.size.h)); s_text_layer = text_layer_create(GRect(0, PBL_DISPLAY_HEIGHT / 2 - Y_OFFSET, PBL_DISPLAY_WIDTH - W_OFFSET, PBL_DISPLAY_HEIGHT));
text_layer_set_font(s_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD)); 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); text_layer_set_background_color(s_text_layer, GColorClear);
update(); update();