From 10d8544c619198874e684f22d9aa9cc1f5d9a3e9 Mon Sep 17 00:00:00 2001 From: Quinten Mennen Date: Wed, 28 May 2025 15:21:44 +0200 Subject: [PATCH] text depth for menu items --- src/manager/game_manager.c | 6 +----- src/menu/menu.c | 12 +++++++----- src/menu/menu_item.c | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/manager/game_manager.c b/src/manager/game_manager.c index ad80d4b..8ca1a9e 100644 --- a/src/manager/game_manager.c +++ b/src/manager/game_manager.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/27 13:48:18 by qmennen #+# #+# */ -/* Updated: 2025/05/28 15:02:30 by qmennen ### ########.fr */ +/* Updated: 2025/05/28 15:07:38 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,13 +33,9 @@ void game_manager_display(t_game_manager *manager) return ; game = manager->game; if (manager->state == GAME_STATE_MENU) - { menu_display(*(manager->active_menu), game->screen); - } else if (manager->state == GAME_STATE_PLAYING) - { game_run(game); - } } void game_manager_update(void *param) diff --git a/src/menu/menu.c b/src/menu/menu.c index 0371843..8218c9d 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/27 14:31:53 by qmennen #+# #+# */ -/* Updated: 2025/05/28 15:00:00 by qmennen ### ########.fr */ +/* Updated: 2025/05/28 15:21:30 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -57,10 +57,9 @@ void menu_display(t_menu *menu, t_screen *screen) i = 0; while (i < menu->num_options) { - menu->items[i]->image = mlx_put_string( - screen->mlx, menu->items[i]->text, - (screen->width - ft_strlen(menu->items[i]->text) * 10) / 2, - half_h + i * 50); + menu->items[i]->image->instances[0].x = (screen->width + - ft_strlen(menu->items[i]->text) * 10) / 2; + menu->items[i]->image->instances[0].y = half_h + i * 50; i++; } } @@ -78,7 +77,10 @@ void menu_toggle(t_menu *menu, t_screen *screen) menu->background->instances[0].enabled = !menu->hidden; i = -1; while (++i < menu->num_options) + { menu->items[i]->image->instances[0].enabled = !menu->hidden; + mlx_set_instance_depth(menu->items[i]->image->instances, 7); + } } void menu_free(t_menu *menu, t_screen *screen) diff --git a/src/menu/menu_item.c b/src/menu/menu_item.c index 7556a91..cae2fb4 100644 --- a/src/menu/menu_item.c +++ b/src/menu/menu_item.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/28 13:50:14 by qmennen #+# #+# */ -/* Updated: 2025/05/28 15:00:07 by qmennen ### ########.fr */ +/* Updated: 2025/05/28 15:12:45 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */