RandyTheSilly/REcounter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Simplify platform-specific defines

Browse Source
This commit is contained in:
Randall Winkhart
2026-07-21 21:03:23 -04:00
parent 9a5d839115
commit f080ae27d7
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/c/main.c
+12 -17
View File
@@ -16,6 +16,16 @@ static StatusBarLayer *s_status_bar_layer;
static int s_count; static int s_count;
#if PBL_ROUND
#define NEAT_BAR_WIDTH ACTION_BAR_WIDTH
#define TEXT_W_OFFSET (PBL_DISPLAY_HEIGHT >= 260 ? 34 : 40)
#define TEXT_Y_OFFSET 27
#else
#define NEAT_BAR_WIDTH (PBL_DISPLAY_HEIGHT >= 228 ? ACTION_BAR_WIDTH - 6 : ACTION_BAR_WIDTH - 10)
#define TEXT_W_OFFSET NEAT_BAR_WIDTH
#define TEXT_Y_OFFSET (PBL_DISPLAY_HEIGHT >= 228 ? 17 : 19)
#endif
void update() { void update() {
static char buffer[10]; static char buffer[10];
snprintf(buffer, sizeof(buffer), "%i", s_count); snprintf(buffer, sizeof(buffer), "%i", s_count);
@@ -75,13 +85,12 @@ void window_load(Window *window) {
#if PBL_RECT #if PBL_RECT
neat_bar_layer_set_icons_x_offset(s_neat_bar_layer, 0); 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);
neat_bar_layer_set_bar_width(s_neat_bar_layer, NEAT_BAR_WIDTH);
#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); 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_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_y_offset(s_neat_bar_layer, 8); neat_bar_layer_set_icons_y_offset(s_neat_bar_layer, 8);
@@ -91,21 +100,7 @@ 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);
#if PBL_DISPLAY_HEIGHT >= 260 && PBL_ROUND s_text_layer = text_layer_create(GRect(0, PBL_DISPLAY_HEIGHT / 2 - TEXT_Y_OFFSET, PBL_DISPLAY_WIDTH - TEXT_W_OFFSET, PBL_DISPLAY_HEIGHT));
#define W_OFFSET 34
#define Y_OFFSET 27
#elif PBL_DISPLAY_HEIGHT >= 228 && PBL_RECT
#define W_OFFSET 28
#define Y_OFFSET 17
#elif PBL_DISPLAY_HEIGHT >= 180 && PBL_ROUND
#define W_OFFSET 40
#define Y_OFFSET 27
#else // 144x168
#define W_OFFSET 20
#define Y_OFFSET 19
#endif
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();