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

LibGUI: Make GUI::Application a Core::Object

Browse source 
Having this on the stack makes whole-program teardown iffy. Turning it
into a Core::Object allows anyone who needs it to extends its lifetime.
This commit is contained in:
Andreas Kling 2020-07-04 14:05:19 +02:00
parent 0d577ab781
commit 1dd1595043
51 changed files with 140 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/html.cpp
View file

@ -37,7 +37,7 @@
int main(int argc, char** argv)
{
GUI::Application app(argc, argv);
auto app = GUI::Application::construct(argc, argv);
auto f = Core::File::construct();
bool success;
@ -67,7 +67,7 @@ int main(int argc, char** argv)
auto& app_menu = menubar->add_menu("HTML");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
app.quit();
app->quit();
}));
auto& help_menu = menubar->add_menu("Help");
@ -75,9 +75,9 @@ int main(int argc, char** argv)
GUI::AboutDialog::show("HTML", Gfx::Bitmap::load_from_file("/res/icons/32x32/filetype-html.png"), window);
}));
app.set_menubar(move(menubar));
app->set_menubar(move(menubar));
window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-html.png"));
return app.exec();
return app->exec();
}