RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:47:45 +00:00
Code Issues Activity Actions

Userland: Add GUI::Window::add_menu() and use it everywhere

Browse source 
Applications previously had to create a GUI::Menubar object, add menus
to it, and then call GUI::Window::set_menubar().

This patch introduces GUI::Window::add_menu() which creates the menubar
automatically and adds items to it. Application code becomes slightly
simpler as a result. :^)
This commit is contained in:
Andreas Kling 2021-07-21 21:21:03 +02:00
parent a4fdb7f029
commit 687a12d7fb
58 changed files with 187 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Games/Minesweeper/main.cpp
View file

@ -103,9 +103,7 @@ int main(int argc, char** argv)
window->resize(size);
});
auto menubar = GUI::Menubar::construct();
auto& game_menu = menubar->add_menu("&Game");
auto& game_menu = window->add_menu("&Game");
game_menu.add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) {
field.reset();
@ -125,7 +123,7 @@ int main(int argc, char** argv)
GUI::Application::the()->quit();
}));
auto& difficulty_menu = menubar->add_menu("&Difficulty");
auto& difficulty_menu = window->add_menu("&Difficulty");
difficulty_menu.add_action(GUI::Action::create("&Beginner", { Mod_Ctrl, Key_B }, [&](auto&) {
field.set_field_size(9, 9, 10);
}));
@ -139,11 +137,9 @@ int main(int argc, char** argv)
field.set_field_size(32, 60, 350);
}));
auto& help_menu = menubar->add_menu("&Help");
auto& help_menu = window->add_menu("&Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Minesweeper", app_icon, window));
window->set_menubar(move(menubar));
window->show();
window->set_icon(app_icon.bitmap_for_size(16));