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

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

Browse source
This commit is contained in:
pbrw 2021-11-25 02:54:30 +01:00 • committed by Andreas Kling
parent 79bc587d03
commit 2642abb773
2 changed files with 16 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,4 +9,4 @@ set(SOURCES
) )
serenity_app(Eyes ICON app-eyes) serenity_app(Eyes ICON app-eyes)
target_link_libraries(Eyes LibGUI LibGfx) target_link_libraries(Eyes LibGUI LibGfx LibMain)

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

@ -6,14 +6,16 @@
#include "EyesWidget.h" #include "EyesWidget.h"
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/Icon.h> #include <LibGUI/Icon.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/Menubar.h> #include <LibGUI/Menubar.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char* argv[]) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
int num_eyes = 2; int num_eyes = 2;
int max_in_row = 13; int max_in_row = 13;
@ -27,29 +29,15 @@ int main(int argc, char* argv[])
args_parser.add_option(max_in_row, "Maximum number of eyes in a row", "max-in-row", 'm', "number"); args_parser.add_option(max_in_row, "Maximum number of eyes in a row", "max-in-row", 'm', "number");
args_parser.add_option(grid_rows, "Number of rows in grid (incompatible with --number)", "grid-rows", 'r', "number"); args_parser.add_option(grid_rows, "Number of rows in grid (incompatible with --number)", "grid-rows", 'r', "number");
args_parser.add_option(grid_columns, "Number of columns in grid (incompatible with --number)", "grid-cols", 'c', "number"); args_parser.add_option(grid_columns, "Number of columns in grid (incompatible with --number)", "grid-cols", 'c', "number");
args_parser.parse(argc, argv); args_parser.parse(arguments);
if (pledge("stdio recvfd sendfd rpath unix cpath wpath thread", nullptr) < 0) { TRY(Core::System::pledge("stdio recvfd sendfd rpath unix cpath wpath thread", nullptr));
perror("pledge");
return 1;
}
auto app = GUI::Application::construct(argc, argv); auto app = TRY(GUI::Application::try_create(arguments));
if (pledge("stdio recvfd sendfd rpath cpath wpath thread", nullptr) < 0) { TRY(Core::System::pledge("stdio recvfd sendfd rpath cpath wpath thread", nullptr));
perror("pledge"); TRY(Core::System::unveil("/res", "r"));
return 1; TRY(Core::System::unveil(nullptr, nullptr));
}
if (unveil("/res", "r") < 0) {
perror("unveil");
return 1;
}
if (unveil(nullptr, nullptr) < 0) {
perror("unveil");
return 1;
}
if ((grid_rows > 0) ^ (grid_columns > 0)) { if ((grid_rows > 0) ^ (grid_columns > 0)) {
warnln("Expected either both or none of 'grid-rows' and 'grid-cols' to be passed."); warnln("Expected either both or none of 'grid-rows' and 'grid-cols' to be passed.");
@ -70,19 +58,19 @@ int main(int argc, char* argv[])
auto app_icon = GUI::Icon::default_icon("app-eyes"); auto app_icon = GUI::Icon::default_icon("app-eyes");
auto window = GUI::Window::construct(); auto window = TRY(GUI::Window::try_create());
window->set_title("Eyes"); window->set_title("Eyes");
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->resize(75 * (full_rows > 0 ? max_in_row : extra_columns), 100 * (full_rows + (extra_columns > 0 ? 1 : 0))); window->resize(75 * (full_rows > 0 ? max_in_row : extra_columns), 100 * (full_rows + (extra_columns > 0 ? 1 : 0)));
window->set_has_alpha_channel(true); window->set_has_alpha_channel(true);
window->set_main_widget<EyesWidget>(num_eyes, full_rows, extra_columns); TRY(window->try_set_main_widget<EyesWidget>(num_eyes, full_rows, extra_columns));
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("Eyes Demo", app_icon, window)); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Eyes Demo", app_icon, window)));
window->show(); window->show();