diff --git a/src/c/main.c b/src/c/main.c index e4c5a24..c8b46ea 100644 --- a/src/c/main.c +++ b/src/c/main.c @@ -25,8 +25,8 @@ static TextLayer *s_theta_txt_layer; static TextLayer *s_parenthesis_txt_layer; static Layer *s_drop_type_layer; static Layer *s_drop_function_layer; -// static Layer *s_drop_over_layer; -// static Layer *s_drop_under_layer; +static Layer *s_drop_over_layer; +static Layer *s_drop_under_layer; static Layer *s_division_layer; // fonts @@ -56,6 +56,8 @@ static const GColor s_primary_color = GColorJaegerGreen; static const GColor s_highlight_color = GColorMediumAquamarine; #define STORAGE_KEY_ALARM_HOUR 0 #define STORAGE_KEY_ALARM_MINUTE 1 +//// alarm +static const uint8_t s_drop_height = 22; ///////////////////////////////// @@ -362,7 +364,7 @@ static void alarm_window_load() { layer_add_child(window_layer, text_layer_get_layer(s_type_txt_layer)); // theta text - s_theta_txt_layer = text_layer_create(GRect(PBL_IF_ROUND_ELSE(0, 8), s_bottom_bar_grect.origin.y + PBL_IF_ROUND_ELSE(47, 16), PBL_DISPLAY_WIDTH, 26)); + s_theta_txt_layer = text_layer_create(GRect(PBL_IF_ROUND_ELSE(0, 8), s_bottom_bar_grect.origin.y + PBL_IF_ROUND_ELSE(50, 16), PBL_DISPLAY_WIDTH, 26)); text_layer_set_text_alignment(s_theta_txt_layer, PBL_IF_ROUND_ELSE(GTextAlignmentCenter, GTextAlignmentLeft)); text_layer_set_background_color(s_theta_txt_layer, GColorClear); text_layer_set_text_color(s_theta_txt_layer, GColorWhite); @@ -372,14 +374,24 @@ static void alarm_window_load() { // drop backgrounds //// type - s_drop_type_layer = layer_create(GRect(PBL_IF_ROUND_ELSE(48, 62), (s_top_bar_grect.size.h / 2) - PBL_IF_ROUND_ELSE(-3, 12), PBL_DISPLAY_WIDTH - PBL_IF_ROUND_ELSE(96, 70), 24)); + s_drop_type_layer = layer_create(GRect(PBL_IF_ROUND_ELSE(48, 62), (s_top_bar_grect.size.h / 2) - PBL_IF_ROUND_ELSE(-4, s_drop_height / 2), PBL_DISPLAY_WIDTH - PBL_IF_ROUND_ELSE(96, 70), s_drop_height)); layer_set_update_proc(s_drop_type_layer, drop_layer_update_proc); layer_add_child(window_layer, s_drop_type_layer); //// function - GRect s_drop_function_grect = GRect(PBL_IF_ROUND_ELSE(48, 45), s_bottom_bar_grect.origin.y + ((s_bottom_bar_grect.size.h / 2) - PBL_IF_ROUND_ELSE(24, 12)), PBL_DISPLAY_WIDTH / 4, 24); + GRect s_drop_function_grect = GRect(PBL_IF_ROUND_ELSE(55, 45), s_bottom_bar_grect.origin.y + ((s_bottom_bar_grect.size.h / 2) - PBL_IF_ROUND_ELSE(s_drop_height - 1, s_drop_height / 2)), 50, s_drop_height); s_drop_function_layer = layer_create(s_drop_function_grect); layer_set_update_proc(s_drop_function_layer, drop_layer_update_proc); layer_add_child(window_layer, s_drop_function_layer); + //// over + GRect s_drop_over_grect = GRect(s_drop_function_grect.origin.x + 78, s_drop_function_grect.origin.y - 13, s_drop_function_grect.size.w + 1, s_drop_function_grect.size.h); + s_drop_over_layer = layer_create(s_drop_over_grect); + layer_set_update_proc(s_drop_over_layer, drop_layer_update_proc); + layer_add_child(window_layer, s_drop_over_layer); + //// under + s_drop_over_grect.origin.y += s_drop_over_grect.size.h + 5; + s_drop_under_layer = layer_create(s_drop_over_grect); + layer_set_update_proc(s_drop_under_layer, drop_layer_update_proc); + layer_add_child(window_layer, s_drop_under_layer); // parenthesis text s_font_mansalva_big = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_MANSALVA_REGULAR_50)); @@ -402,6 +414,8 @@ static void alarm_window_load() { static void alarm_window_unload() { layer_destroy(s_division_layer); text_layer_destroy(s_parenthesis_txt_layer); + layer_destroy(s_drop_under_layer); + layer_destroy(s_drop_over_layer); layer_destroy(s_drop_function_layer); layer_destroy(s_drop_type_layer); text_layer_destroy(s_theta_txt_layer);