RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:57:44 +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

8
Userland/Applications/Magnifier/main.cpp
View file

@ -48,8 +48,7 @@ int main(int argc, char** argv)
window->set_icon(app_icon.bitmap_for_size(16));
auto& magnifier = window->set_main_widget<MagnifierWidget>();
auto menubar = GUI::Menubar::construct();
auto& file_menu = menubar->add_menu("&File");
auto& file_menu = window->add_menu("&File");
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
app->quit();
}));
@ -70,15 +69,14 @@ int main(int argc, char** argv)
size_action_group->add_action(four_x_action);
size_action_group->set_exclusive(true);
auto& view_menu = menubar->add_menu("&View");
auto& view_menu = window->add_menu("&View");
view_menu.add_action(two_x_action);
view_menu.add_action(four_x_action);
two_x_action->set_checked(true);
auto& help_menu = menubar->add_menu("&Help");
auto& help_menu = window->add_menu("&Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Magnifier", app_icon, window));
window->set_menubar(move(menubar));
window->show();
magnifier.track_cursor_globally();