diff options
| author | P. J. McDermott <pj@pehjota.net> | 2021-08-06 01:35:30 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2021-08-06 01:35:30 (EDT) |
| commit | 592ee2f218f1886decc478c3353810c7c11b51d3 (patch) | |
| tree | 91d8b4cd170bad380b2f34efd0fd3029ad18c30d /src/splash.c | |
| parent | ab7ea3c8367dad3101a250bfe6873753ba1875b1 (diff) | |
| download | mazefight-592ee2f218f1886decc478c3353810c7c11b51d3.zip mazefight-592ee2f218f1886decc478c3353810c7c11b51d3.tar.gz mazefight-592ee2f218f1886decc478c3353810c7c11b51d3.tar.bz2 | |
tk: Add window object
Diffstat (limited to 'src/splash.c')
| -rw-r--r-- | src/splash.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/splash.c b/src/splash.c index 08eaeed..3c743a3 100644 --- a/src/splash.c +++ b/src/splash.c @@ -168,7 +168,7 @@ mf_splash(SDL_Renderer *renderer) TTF_Font *text_font = NULL; SDL_Color form_color; SDL_Color text_color; - struct mftk_widget *box; + struct mftk_window *win = NULL; SDL_Event event; /* Create maze */ @@ -204,17 +204,18 @@ mf_splash(SDL_Renderer *renderer) text_color.r = MF_COLOR_FORE_R, text_color.g = MF_COLOR_FORE_G; text_color.b = MF_COLOR_FORE_B, text_color.a = MF_COLOR_FORE_A; - 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), + win = mftk_window_new(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_GRID_HALIGN_C|MFTK_GRID_VALIGN_T, - _mf_splash_form(renderer, text_font, - &text_color), + _mf_splash_form(renderer, text_font, + &text_color), MFTK_GRID_HALIGN_C|MFTK_GRID_VALIGN_T + ) ) ); - mftk_widget_layout(box); TTF_CloseFont(title_font); title_font = NULL; @@ -236,13 +237,13 @@ mf_splash(SDL_Renderer *renderer) SDL_RenderClear(renderer); mf_maze_render(maze, renderer, &maze_color, MF_SPLASH_MAZE_CELL_W); - mftk_widget_event(box, &event, 0, 0); - mftk_widget_render(box, renderer, 0, 0); + mftk_window_event(win, &event); + mftk_window_render(win, renderer); SDL_RenderPresent(renderer); } quit: - mftk_widget_destroy(&box); + mftk_window_destroy(&win); TTF_CloseFont(text_font); text_font = NULL; mf_maze_destroy(&maze); @@ -259,7 +260,7 @@ mf_splash(SDL_Renderer *renderer) if (text_font != NULL) { TTF_CloseFont(text_font); } - mftk_widget_destroy(&box); + mftk_window_destroy(&win); mf_maze_destroy(&maze); return -1; } |