ShuriZma
/
bsnes
mirror of https://github.com/bsnes-emu/bsnes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #386

This commit is contained in:
Lior Halphon 2021-05-18 20:21:21 +03:00
parent 2afeb7dee3
commit fcbbecea17
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
SDL/gui.c
View File

@ -1375,7 +1375,22 @@ void run_gui(bool is_running)
case SDL_KEYDOWN: case SDL_KEYDOWN:
if (event_hotkey_code(&event) == SDL_SCANCODE_F && event.key.keysym.mod & MODIFIER) { if (gui_state == WAITING_FOR_KEY) {
if (current_selection >= 8) {
if (current_selection == 8) {
configuration.keys[8] = event.key.keysym.scancode;
}
else {
configuration.keys_2[current_selection - 9] = event.key.keysym.scancode;
}
}
else {
configuration.keys[current_selection] = event.key.keysym.scancode;
}
gui_state = SHOWING_MENU;
should_render = true;
}
else if (event_hotkey_code(&event) == SDL_SCANCODE_F && event.key.keysym.mod & MODIFIER) {
if ((SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN_DESKTOP) == false) { if ((SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN_DESKTOP) == false) {
SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
} }
@ -1384,7 +1399,7 @@ void run_gui(bool is_running)
} }
update_viewport(); update_viewport();
} }
if (event_hotkey_code(&event) == SDL_SCANCODE_O) { else if (event_hotkey_code(&event) == SDL_SCANCODE_O) {
if (event.key.keysym.mod & MODIFIER) { if (event.key.keysym.mod & MODIFIER) {
char *filename = do_open_rom_dialog(); char *filename = do_open_rom_dialog();
if (filename) { if (filename) {
@ -1477,21 +1492,6 @@ void run_gui(bool is_running)
} }
should_render = true; should_render = true;
} }
else if (gui_state == WAITING_FOR_KEY) {
if (current_selection >= 8) {
if (current_selection == 8) {
configuration.keys[8] = event.key.keysym.scancode;
}
else {
configuration.keys_2[current_selection - 9] = event.key.keysym.scancode;
}
}
else {
configuration.keys[current_selection] = event.key.keysym.scancode;
}
gui_state = SHOWING_MENU;
should_render = true;
}
break; break;
} }