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

Userland: Turn all application menus into window menus :^)

Browse source
This commit is contained in:
Andreas Kling 2021-03-25 21:41:39 +01:00
parent fcc8e3484f
commit 78b12e1521
47 changed files with 100 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Demos/CatDog/main.cpp
View file

@ -234,11 +234,11 @@ int main(int argc, char** argv)
root_widget.layout()->set_spacing(0);
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("CatDog Demo");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("CatDog Demo", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
root_widget.track_cursor_globally();

4
Userland/Demos/Cube/Cube.cpp
View file

@ -264,7 +264,7 @@ int main(int argc, char** argv)
window->set_icon(app_icon.bitmap_for_size(16));
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Cube Demo");
auto& app_menu = menubar->add_menu("File");
auto show_window_frame_action = GUI::Action::create_checkable("Show window frame", [&](auto& action) {
cube.set_show_window_frame(action.is_checked());
});
@ -276,7 +276,7 @@ int main(int argc, char** argv)
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Cube Demo", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
cube.on_context_menu_request = [&](auto& event) {
app_menu.popup(event.screen_position());

4
Userland/Demos/Eyes/main.cpp
View file

@ -100,13 +100,13 @@ int main(int argc, char* argv[])
auto& eyes = window->set_main_widget<EyesWidget>(num_eyes, full_rows, extra_columns);
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Eyes Demo");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Eyes Demo", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
eyes.track_cursor_globally();

4
Userland/Demos/Mouse/main.cpp
View file

@ -199,13 +199,13 @@ int main(int argc, char** argv)
main_widget.set_fill_with_background_color(true);
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Mouse Demo");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Mouse Demo", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->set_resizable(false);
window->show();
return app->exec();

5
Userland/Demos/WidgetGallery/main.cpp
View file

@ -77,14 +77,13 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Widget Gallery");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Widget Gallery", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
return app->exec();