From 4290eee6d45aab8e9f1c47d5d7d35e9ceccd78b2 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 04 Aug 2021 21:01:30 -0400 Subject: tk: Add box widget --- (limited to 'src/splash.c') diff --git a/src/splash.c b/src/splash.c index 9b94057..dee2eb2 100644 --- a/src/splash.c +++ b/src/splash.c @@ -41,9 +41,10 @@ mf_splash(SDL_Renderer *renderer) char *font_path = NULL; TTF_Font *title_font = NULL; TTF_Font *text_font = NULL; + SDL_Color form_color; SDL_Color text_color; SDL_Color butn_color; - struct mftk_widget *grid; + struct mftk_widget *box; struct mf_maze *maze = NULL; SDL_Color maze_color; SDL_Event event; @@ -64,6 +65,10 @@ mf_splash(SDL_Renderer *renderer) goto err; } + form_color.r = MF_COLOR_FORM_R; + form_color.g = MF_COLOR_FORM_G; + form_color.b = MF_COLOR_FORM_B; + form_color.a = MF_COLOR_FORM_A; text_color.r = MF_COLOR_FORE_R; text_color.g = MF_COLOR_FORE_G; text_color.b = MF_COLOR_FORE_B; @@ -73,14 +78,18 @@ mf_splash(SDL_Renderer *renderer) butn_color.b = MF_COLOR_BUTN_B; butn_color.a = MF_COLOR_BUTN_A; - grid = mftk_grid_new(2, 1, MF_SPLASH_TITLE_M, 0, - mftk_label_new(title_font, "Maze Fight", &text_color, - renderer), - mftk_button_new(text_font, "Play", &text_color, - &butn_color, 2, &_mf_splash_play, NULL, - renderer)); + box = mftk_box_new(MF_WINDOW_W, MF_WINDOW_H, 0, 0, MF_SPLASH_FORM_P, + &form_color, + mftk_grid_new(2, 1, MF_SPLASH_TITLE_M, 0, + mftk_label_new(title_font, "Maze Fight", + &text_color, renderer), + mftk_button_new(text_font, "Play", &text_color, + &butn_color, 2, &_mf_splash_play, NULL, + renderer) + ) + ); /* TODO: Widgets */ - mftk_widget_layout(grid); + mftk_widget_layout(box); TTF_CloseFont(title_font); title_font = NULL; @@ -116,15 +125,13 @@ mf_splash(SDL_Renderer *renderer) SDL_RenderClear(renderer); mf_maze_render(maze, renderer, &maze_color, MF_SPLASH_MAZE_CELL_W); - mftk_widget_event(grid, &event, - MF_SPLASH_WINDOW_P, MF_SPLASH_WINDOW_P); - mftk_widget_render(grid, renderer, - MF_SPLASH_WINDOW_P, MF_SPLASH_WINDOW_P); + mftk_widget_event(box, &event, 0, 0); + mftk_widget_render(box, renderer, 0, 0); SDL_RenderPresent(renderer); } quit: - mftk_widget_destroy(&grid); + mftk_widget_destroy(&box); mf_maze_destroy(&maze); return 0; @@ -139,7 +146,7 @@ mf_splash(SDL_Renderer *renderer) if (text_font != NULL) { TTF_CloseFont(text_font); } - mftk_widget_destroy(&grid); + mftk_widget_destroy(&box); mf_maze_destroy(&maze); return -1; } -- cgit v0.9.1