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

Shrink top bar in alarm window

Browse Source
This commit is contained in:
Randall Winkhart
2026-08-08 00:17:57 -04:00
parent ead95df378
commit 79701bffcb
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/c/main.c
+13 -7
View File
@@ -254,8 +254,12 @@ static void bottom_bar_layer_update_proc(Layer *layer, GContext *ctx) {
graphics_fill_rect(ctx, layer_get_bounds(layer), 0, GCornerNone); graphics_fill_rect(ctx, layer_get_bounds(layer), 0, GCornerNone);
} }
static void add_bar_layers_to_window(Layer *window_layer) { static void add_bar_layers_to_window(Layer *window_layer, bool small_top) {
if (small_top) {
s_top_bar_layer = layer_create(GRect(s_top_bar_grect.origin.x, s_top_bar_grect.origin.y, s_top_bar_grect.size.w, s_top_bar_grect.size.h / 2));
} else {
s_top_bar_layer = layer_create(s_top_bar_grect); s_top_bar_layer = layer_create(s_top_bar_grect);
}
layer_set_update_proc(s_top_bar_layer, top_bar_layer_update_proc); layer_set_update_proc(s_top_bar_layer, top_bar_layer_update_proc);
layer_add_child(window_layer, s_top_bar_layer); layer_add_child(window_layer, s_top_bar_layer);
s_bottom_bar_layer = layer_create(s_bottom_bar_grect); s_bottom_bar_layer = layer_create(s_bottom_bar_grect);
@@ -283,7 +287,7 @@ static void setter_window_load() {
Layer *window_layer = window_get_root_layer(s_window); Layer *window_layer = window_get_root_layer(s_window);
// top&bottom bars // top&bottom bars
add_bar_layers_to_window(window_layer); add_bar_layers_to_window(window_layer, false);
// clock icon // clock icon
s_clock_bmp = gbitmap_create_with_resource(RESOURCE_ID_CLOCK35); s_clock_bmp = gbitmap_create_with_resource(RESOURCE_ID_CLOCK35);
@@ -441,7 +445,7 @@ static void alarm_window_load() {
s_setter_highlight_color = s_primary_color; s_setter_highlight_color = s_primary_color;
// top&bottom bars // top&bottom bars
add_bar_layers_to_window(window_layer); add_bar_layers_to_window(window_layer, true);
// theta text // theta text
s_font_mansalva_small = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_MANSALVA_REGULAR_22)); s_font_mansalva_small = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_MANSALVA_REGULAR_22));
@@ -507,24 +511,26 @@ static void alarm_window_load() {
layer_add_child(window_layer, s_alarm_highlight_layer); layer_add_child(window_layer, s_alarm_highlight_layer);
// triangle // triangle
s_triangle_layer = right_triangle_layer_create(GRect(0, s_top_bar_grect.size.h + 1, PBL_DISPLAY_WIDTH, PBL_DISPLAY_HEIGHT - (s_top_bar_grect.size.h * 2)), GColorBlack); static const uint8_t small_top_bar_height = s_top_bar_grect.size.h / 2;
s_triangle_layer = right_triangle_layer_create(GRect(0, small_top_bar_height, PBL_DISPLAY_WIDTH, PBL_DISPLAY_HEIGHT - small_top_bar_height - s_bottom_bar_grect.size.h), GColorBlack);
layer_add_child(window_layer, s_triangle_layer->layer); layer_add_child(window_layer, s_triangle_layer->layer);
// triangle measurements text layers // triangle measurements text layers
uint16_t bc_y = (PBL_DISPLAY_HEIGHT / 2) - small_top_bar_height;
//// side_a //// side_a
s_side_a_txt_layer = text_layer_create(GRect(0, s_bottom_bar_grect.origin.y - 25, PBL_DISPLAY_WIDTH, 26)); s_side_a_txt_layer = text_layer_create(GRect(0, s_bottom_bar_grect.origin.y - 26, PBL_DISPLAY_WIDTH, 26));
text_layer_set_background_color(s_side_a_txt_layer, GColorClear); text_layer_set_background_color(s_side_a_txt_layer, GColorClear);
text_layer_set_font(s_side_a_txt_layer, s_font_mansalva_small); text_layer_set_font(s_side_a_txt_layer, s_font_mansalva_small);
text_layer_set_text_alignment(s_side_a_txt_layer, GTextAlignmentCenter); text_layer_set_text_alignment(s_side_a_txt_layer, GTextAlignmentCenter);
layer_add_child(window_layer, text_layer_get_layer(s_side_a_txt_layer)); layer_add_child(window_layer, text_layer_get_layer(s_side_a_txt_layer));
//// side_b //// side_b
s_side_b_txt_layer = text_layer_create(GRect(-3, PBL_DISPLAY_WIDTH / 2, PBL_DISPLAY_WIDTH, 26)); s_side_b_txt_layer = text_layer_create(GRect(-4, bc_y, PBL_DISPLAY_WIDTH, 26));
text_layer_set_background_color(s_side_b_txt_layer, GColorClear); text_layer_set_background_color(s_side_b_txt_layer, GColorClear);
text_layer_set_font(s_side_b_txt_layer, s_font_mansalva_small); text_layer_set_font(s_side_b_txt_layer, s_font_mansalva_small);
text_layer_set_text_alignment(s_side_b_txt_layer, GTextAlignmentRight); text_layer_set_text_alignment(s_side_b_txt_layer, GTextAlignmentRight);
layer_add_child(window_layer, text_layer_get_layer(s_side_b_txt_layer)); layer_add_child(window_layer, text_layer_get_layer(s_side_b_txt_layer));
//// side_c //// side_c
s_side_c_txt_layer = text_layer_create(GRect(3, PBL_DISPLAY_WIDTH / 2, PBL_DISPLAY_WIDTH, 26)); s_side_c_txt_layer = text_layer_create(GRect(4, bc_y, PBL_DISPLAY_WIDTH, 26));
text_layer_set_background_color(s_side_c_txt_layer, GColorClear); text_layer_set_background_color(s_side_c_txt_layer, GColorClear);
text_layer_set_font(s_side_c_txt_layer, s_font_mansalva_small); text_layer_set_font(s_side_c_txt_layer, s_font_mansalva_small);
layer_add_child(window_layer, text_layer_get_layer(s_side_c_txt_layer)); layer_add_child(window_layer, text_layer_get_layer(s_side_c_txt_layer));