Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only hide menu when going fullscreen from keyboard #167

Merged
merged 1 commit into from
Mar 27, 2022
Merged

Only hide menu when going fullscreen from keyboard #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/fullscreen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,33 @@ extern ALLEGRO_EVENT_QUEUE *queue;
extern ALLEGRO_DISPLAY *tmp_display;
void enter_fullscreen()
{
video_enterfullscreen();
gui_allegro_destroy(queue, tmp_display);
}

void leave_fullscreen()
{
gui_allegro_init(queue, tmp_display);
video_leavefullscreen();
}
void toggle_fullscreen_menu()
{
if (fullscreen) {
fullscreen = 0;
gui_allegro_init(queue, tmp_display);
video_leavefullscreen();
} else {
fullscreen = 1;
video_enterfullscreen();
gui_allegro_destroy(queue, tmp_display);
}
}

void toggle_fullscreen()
{
if (fullscreen) {
fullscreen = 0;
leave_fullscreen();
video_leavefullscreen();
} else {
fullscreen = 1;
enter_fullscreen();
video_enterfullscreen();
}
}
1 change: 1 addition & 0 deletions src/fullscreen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
void enter_fullscreen();
void leave_fullscreen();
void toggle_fullscreen();
void toggle_fullscreen_menu();
4 changes: 2 additions & 2 deletions src/keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,9 +674,9 @@ const struct key_act_const keyact_const[KEY_ACTION_MAX] = {
{ "break", ALLEGRO_KEY_F12, false, main_key_break, do_nothing },
{ "full-Speed", ALLEGRO_KEY_PGUP, false, main_start_fullspeed, stop_full_speed },
{ "pause", ALLEGRO_KEY_PGDN, false, main_key_pause, do_nothing },
{ "full-screen1", ALLEGRO_KEY_F11, false, toggle_fullscreen, do_nothing },
{ "full-screen1", ALLEGRO_KEY_F11, false, toggle_fullscreen_menu, do_nothing },
{ "debug-break", ALLEGRO_KEY_F10, false, debug_break, do_nothing },
{ "full-screen2", ALLEGRO_KEY_ENTER, true, toggle_fullscreen, do_nothing }
{ "full-screen2", ALLEGRO_KEY_ENTER, true, toggle_fullscreen_menu, do_nothing }
};

uint8_t keylookup[ALLEGRO_KEY_MAX];
Expand Down