sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Fix mouse mode not activating buttons

scene_man
En Yi 2023-08-15 21:52:56 +08:00
parent e7c6f9929b
commit bda335fd6a
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scenes/menu_scene.c
View File

@ -16,6 +16,21 @@ static void menu_scene_render_func(Scene_t* scene)
EndDrawing(); EndDrawing();
} }
static void exec_component_function(Scene_t* scene, int sel)
{
switch(sel)
{
case 0:
change_scene(scene->engine, 1);
break;
case 1:
change_scene(scene->engine, 2);
break;
default:
break;
}
}
static void menu_do_action(Scene_t* scene, ActionType_t action, bool pressed) static void menu_do_action(Scene_t* scene, ActionType_t action, bool pressed)
{ {
MenuSceneData_t* data = &(CONTAINER_OF(scene, MenuScene_t, scene)->data); MenuSceneData_t* data = &(CONTAINER_OF(scene, MenuScene_t, scene)->data);
@ -53,17 +68,7 @@ static void menu_do_action(Scene_t* scene, ActionType_t action, bool pressed)
data->selected_comp = new_selection; data->selected_comp = new_selection;
if (action == ACTION_CONFIRM && scene->engine != NULL) if (action == ACTION_CONFIRM && scene->engine != NULL)
{ {
switch(data->selected_comp) exec_component_function(scene, data->selected_comp);
{
case 0:
change_scene(scene->engine, 1);
break;
case 1:
change_scene(scene->engine, 2);
break;
default:
break;
}
} }
} }
} }
@ -103,14 +108,7 @@ static void gui_loop(Scene_t* scene)
data->buttons[i].pressed = true; data->buttons[i].pressed = true;
if (scene->engine != NULL) if (scene->engine != NULL)
{ {
switch(i) exec_component_function(scene, i);
{
case 0:
change_scene(scene->engine, 1);
break;
default:
break;
}
} }
} }
data->selected_comp = i; data->selected_comp = i;
@ -149,7 +147,7 @@ void init_menu_scene(MenuScene_t* scene)
}; };
scene->data.max_comp = 4; scene->data.max_comp = 4;
scene->data.selected_comp = 0; scene->data.selected_comp = 0;
scene->data.mode = KEYBOARD_MODE; scene->data.mode = MOUSE_MODE;
sc_map_put_64(&scene->scene.action_map, KEY_UP, ACTION_UP); sc_map_put_64(&scene->scene.action_map, KEY_UP, ACTION_UP);
sc_map_put_64(&scene->scene.action_map, KEY_DOWN, ACTION_DOWN); sc_map_put_64(&scene->scene.action_map, KEY_DOWN, ACTION_DOWN);