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

Mouse: Use TRY() a lot more :^)

Browse source
This commit is contained in:
pbrw 2021-11-25 02:56:30 +01:00 • committed by Andreas Kling
parent 162c271eb6
commit 14081b8a92
2 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Demos/Mouse/CMakeLists.txt
View file

@ -8,4 +8,4 @@ set(SOURCES
) )
serenity_app(Mouse ICON app-mouse) serenity_app(Mouse ICON app-mouse)
target_link_libraries(Mouse LibGUI LibGfx) target_link_libraries(Mouse LibGUI LibGfx LibMain)

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

@ -6,6 +6,7 @@
*/ */
#include <AK/Math.h> #include <AK/Math.h>
#include <LibCore/System.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
@ -19,6 +20,7 @@
#include <LibGUI/WindowServerConnection.h> #include <LibGUI/WindowServerConnection.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/Path.h> #include <LibGfx/Path.h>
#include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>
class MainFrame final : public GUI::Frame { class MainFrame final : public GUI::Frame {
@ -155,39 +157,28 @@ private:
} }
}; };
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
auto app = GUI::Application::construct(argc, argv); auto app = TRY(GUI::Application::try_create(arguments));
auto app_icon = GUI::Icon::default_icon("app-mouse"); auto app_icon = GUI::Icon::default_icon("app-mouse");
if (pledge("stdio recvfd sendfd rpath", nullptr) < 0) { TRY(Core::System::pledge("stdio recvfd sendfd rpath", nullptr));
perror("pledge"); TRY(Core::System::unveil("/res", "r"));
return 1; TRY(Core::System::unveil(nullptr, nullptr));
}
if (unveil("/res", "r") < 0) { auto window = TRY(GUI::Window::try_create());
perror("unveil");
return 1;
}
if (unveil(nullptr, nullptr) < 0) {
perror("unveil");
return 1;
}
auto window = GUI::Window::construct();
window->set_title("Mouse demo"); window->set_title("Mouse demo");
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->resize(160, 155); window->resize(160, 155);
auto& main_widget = window->set_main_widget<MainFrame>(); auto main_widget = TRY(window->try_set_main_widget<MainFrame>());
main_widget.set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
auto& file_menu = window->add_menu("&File"); auto file_menu = TRY(window->try_add_menu("&File"));
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })));
auto& help_menu = window->add_menu("&Help"); auto help_menu = TRY(window->try_add_menu("&Help"));
help_menu.add_action(GUI::CommonActions::make_about_action("Mouse Demo", app_icon, window)); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Mouse Demo", app_icon, window)));
window->set_resizable(false); window->set_resizable(false);
window->show(); window->show();