1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:17:35 +00:00

Games: Add fullscreen option

This commit is contained in:
Hugh Davenport 2024-01-05 09:12:37 +13:00 committed by Andrew Kaster
parent 13c66ebf12
commit 64edf6913f
13 changed files with 66 additions and 0 deletions

View file

@ -216,6 +216,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) {

View file

@ -73,6 +73,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {

View file

@ -194,6 +194,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
engine_submenu->add_action(*action); engine_submenu->add_action(*action);
} }
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) {

View file

@ -60,6 +60,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {

View file

@ -82,10 +82,14 @@ void Game::paint_event(GUI::PaintEvent& event)
void Game::keydown_event(GUI::KeyEvent& event) void Game::keydown_event(GUI::KeyEvent& event)
{ {
// FIXME: After #22573 is merged, then remove the case for F11 below and ensure it is in this check here which also checks for modifiers
switch (event.key()) { switch (event.key()) {
case Key_Escape: case Key_Escape:
GUI::Application::the()->quit(); GUI::Application::the()->quit();
break; break;
case Key_F11:
event.ignore();
break;
default: default:
player_input(); player_input();
break; break;

View file

@ -60,6 +60,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) {

View file

@ -187,6 +187,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) {

View file

@ -150,6 +150,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) {

View file

@ -97,6 +97,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
game_menu->add_separator(); game_menu->add_separator();
game_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); game_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) {

View file

@ -74,6 +74,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
game_menu->add_action(*chord_toggler_action); game_menu->add_action(*chord_toggler_action);
game_menu->add_separator(); game_menu->add_separator();
// Put Fullscreen in Game rather than View
// When in beginner mode it can only show 3 menus. Adding View makes 4
game_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
game_menu->add_separator();
game_menu->add_action(GUI::CommonActions::make_quit_action([](auto&) { game_menu->add_action(GUI::CommonActions::make_quit_action([](auto&) {
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));

View file

@ -151,6 +151,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([](auto&) {

View file

@ -239,6 +239,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
game_menu->add_separator(); game_menu->add_separator();
game_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); game_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto view_menu = window->add_menu("&View"_string);
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {

View file

@ -284,6 +284,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
view_menu->add_action(high_score_action); view_menu->add_action(high_score_action);
view_menu->add_action(best_time_actions); view_menu->add_action(best_time_actions);
view_menu->add_separator();
view_menu->add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) {
window->set_fullscreen(!window->is_fullscreen());
}));
auto help_menu = window->add_menu("&Help"_string); auto help_menu = window->add_menu("&Help"_string);
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) { help_menu->add_action(GUI::CommonActions::make_help_action([&man_file](auto&) {