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

LibGUI: Add MenuBar::add_menu(name)

Browse source 
This allows us to construct menus in a more natural way:

    auto& file_menu = menubar->add_menu("File");
    file_menu.add_action(...);

Instead of the old way:

    auto file_menu = GUI::Menu::construct();
    file_menu->add_action(...);
    menubar->add_menu(file_menu);
This commit is contained in:
Andreas Kling 2020-04-04 12:18:40 +02:00
parent faac43597a
commit 26eeaef0a8
26 changed files with 261 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Games/Solitaire/main.cpp
View file

@ -51,22 +51,19 @@ int main(int argc, char** argv)
window->set_title(String::format("Score: %u - Solitaire", score));
});
auto menu_bar = make<GUI::MenuBar>();
auto app_menu = GUI::Menu::construct("Solitaire");
auto help_menu = GUI::Menu::construct("Help");
auto menubar = make<GUI::MenuBar>();
auto& app_menu = menubar->add_menu("Solitaire");
app_menu->add_action(GUI::Action::create("Restart game", [&](auto&) { widget->setup(); }));
app_menu->add_separator();
app_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app.quit(); }));
app_menu.add_action(GUI::Action::create("Restart game", [&](auto&) { widget->setup(); }));
app_menu.add_separator();
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app.quit(); }));
help_menu->add_action(GUI::Action::create("About", [&](auto&) {
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::Action::create("About", [&](auto&) {
GUI::AboutDialog::show("Solitaire", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-solitaire.png"), window);
}));
menu_bar->add_menu(move(app_menu));
menu_bar->add_menu(move(help_menu));
app.set_menubar(move(menu_bar));
app.set_menubar(move(menubar));
window->set_main_widget(widget);
window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-solitaire.png"));
window->show();