diff --git a/src/c/main.c b/src/c/main.c index 5d6f3a0..ef0c447 100644 --- a/src/c/main.c +++ b/src/c/main.c @@ -548,7 +548,7 @@ static void alarm_window_load() { layer_add_child(window_layer, s_alarm_highlight_layer); // triangle - s_triangle_layer = 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))); + s_triangle_layer = 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); layer_add_child(window_layer, s_triangle_layer->layer); schedule_fallback_alarm(); diff --git a/src/c/triangles.c b/src/c/triangles.c index 197a96d..7d5f159 100644 --- a/src/c/triangles.c +++ b/src/c/triangles.c @@ -50,11 +50,14 @@ static void triangle_layer_update_proc(Layer *layer, GContext *ctx) { graphics_draw_line(ctx, GPoint(end_x, base_y), GPoint(apex_x, apex_y)); } -TriangleLayer *triangle_layer_create(GRect frame) { +TriangleLayer *triangle_layer_create(GRect frame, GColor color) { TriangleLayer *tri = malloc(sizeof(TriangleLayer)); if (!tri) return NULL; + // set color + tri->color = color; + // determine angles uint8_t r1, r2; do { @@ -83,7 +86,7 @@ TriangleLayer *triangle_layer_create(GRect frame) { max_sin = sin_C; // longest side randomly chosen -#define MIN_SIDE 10 +#define MIN_SIDE 20 uint16_t max_side = (frame.size.w < frame.size.h) ? frame.size.w : frame.size.h; max_side = max_side - 12; // basic margin uint16_t largest_side = MIN_SIDE + (rand() % (max_side - MIN_SIDE + 1)); diff --git a/src/c/triangles.h b/src/c/triangles.h index e028d49..3f1d4c4 100644 --- a/src/c/triangles.h +++ b/src/c/triangles.h @@ -16,5 +16,5 @@ typedef struct { uint16_t side_c; } __attribute__((__packed__)) TriangleLayer; -TriangleLayer *triangle_layer_create(GRect frame); +TriangleLayer *triangle_layer_create(GRect frame, GColor color); void triangle_layer_destroy(TriangleLayer *tri);