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

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

Browse source
This commit is contained in:
pbrw 2021-11-25 02:55:57 +01:00 • committed by Andreas Kling
parent 8293ad33ee
commit 601de466cb
2 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,4 +8,4 @@ set(SOURCES
) )
serenity_app(Mandelbrot ICON app-mandelbrot) serenity_app(Mandelbrot ICON app-mandelbrot)
target_link_libraries(Mandelbrot LibGUI LibCore LibGfx) target_link_libraries(Mandelbrot LibGUI LibCore LibGfx LibMain)

52
Userland/Demos/Mandelbrot/Mandelbrot.cpp
View file

@ -5,6 +5,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibCore/System.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/FilePicker.h> #include <LibGUI/FilePicker.h>
@ -17,6 +18,7 @@
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/PNGWriter.h>
#include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>
class MandelbrotSet { class MandelbrotSet {
@ -371,68 +373,58 @@ void Mandelbrot::export_image(String const& export_path)
GUI::MessageBox::show(window(), "Image was successfully exported.", "Mandelbrot", GUI::MessageBox::Type::Information); GUI::MessageBox::show(window(), "Image was successfully exported.", "Mandelbrot", GUI::MessageBox::Type::Information);
} }
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));
if (pledge("stdio thread recvfd sendfd rpath wpath cpath", nullptr) < 0) { TRY(Core::System::pledge("stdio thread recvfd sendfd rpath wpath cpath", nullptr));
perror("pledge");
return 1;
}
#if 0 #if 0
if (unveil("/res", "r") < 0) { TRY(Core::System::unveil("/res", "r"));
perror("unveil"); TRY(unveil(nullptr, nullptr));
return 1;
}
if (unveil(nullptr, nullptr) < 0) {
perror("unveil");
return 1;
}
#endif #endif
auto window = GUI::Window::construct(); auto window = TRY(GUI::Window::try_create());
window->set_double_buffering_enabled(false); window->set_double_buffering_enabled(false);
window->set_title("Mandelbrot"); window->set_title("Mandelbrot");
window->set_minimum_size(320, 240); window->set_minimum_size(320, 240);
window->resize(window->minimum_size() * 2); window->resize(window->minimum_size() * 2);
auto& mandelbrot = window->set_main_widget<Mandelbrot>(); auto mandelbrot = TRY(window->try_set_main_widget<Mandelbrot>());
auto& file_menu = window->add_menu("&File"); auto file_menu = TRY(window->try_add_menu("&File"));
file_menu.add_action(GUI::Action::create("&Export...", { Mod_Ctrl | Mod_Shift, Key_S }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/save.png").release_value_but_fixme_should_propagate_errors(), TRY(file_menu->try_add_action(GUI::Action::create("&Export...", { Mod_Ctrl | Mod_Shift, Key_S }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/save.png").release_value_but_fixme_should_propagate_errors(),
[&](GUI::Action&) { [&](GUI::Action&) {
Optional<String> export_path = GUI::FilePicker::get_save_filepath(window, "untitled", "png"); Optional<String> export_path = GUI::FilePicker::get_save_filepath(window, "untitled", "png");
if (!export_path.has_value()) if (!export_path.has_value())
return; return;
mandelbrot.export_image(export_path.value()); mandelbrot->export_image(export_path.value());
})); })));
file_menu.add_separator(); TRY(file_menu->try_add_separator());
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 zoom_in_action = GUI::CommonActions::make_zoom_in_action( auto zoom_in_action = GUI::CommonActions::make_zoom_in_action(
[&](auto&) { [&](auto&) {
mandelbrot.zoom(Mandelbrot::Zoom::In, mandelbrot.relative_rect().center()); mandelbrot->zoom(Mandelbrot::Zoom::In, mandelbrot->relative_rect().center());
}, },
window); window);
auto reset_zoom_action = GUI::CommonActions::make_reset_zoom_action( auto reset_zoom_action = GUI::CommonActions::make_reset_zoom_action(
[&](auto&) { [&](auto&) {
// FIXME: Ideally, this would only reset zoom. Currently, it resets pan too. // FIXME: Ideally, this would only reset zoom. Currently, it resets pan too.
mandelbrot.reset(); mandelbrot->reset();
}, },
window); window);
auto zoom_out_action = GUI::CommonActions::make_zoom_out_action( auto zoom_out_action = GUI::CommonActions::make_zoom_out_action(
[&](auto&) { [&](auto&) {
mandelbrot.zoom(Mandelbrot::Zoom::Out, mandelbrot.relative_rect().center()); mandelbrot->zoom(Mandelbrot::Zoom::Out, mandelbrot->relative_rect().center());
}, },
window); window);
auto& view_menu = window->add_menu("&View"); auto view_menu = TRY(window->try_add_menu("&View"));
view_menu.add_action(zoom_in_action); TRY(view_menu->try_add_action(zoom_in_action));
view_menu.add_action(reset_zoom_action); TRY(view_menu->try_add_action(reset_zoom_action));
view_menu.add_action(zoom_out_action); TRY(view_menu->try_add_action(zoom_out_action));
window->show(); window->show();