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

LibGfx: Prefer using Gfx::Bitmap::load_from_file instead of load_png()

Browse source 
Code that just wants to open a Gfx::Bitmap from a file should not be
calling the PNG codec directly.
This commit is contained in:
Andreas Kling 2020-02-06 13:39:17 +01:00
parent f8b00aa290
commit 5c06c32df4
31 changed files with 48 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Applications/PaintBrush/main.cpp
View file

@ -27,7 +27,6 @@
#include "PaintableWidget.h"
#include "PaletteWidget.h"
#include "ToolboxWidget.h"
#include <LibGfx/PNGLoader.h>
#include <LibGUI/GAboutDialog.h>
#include <LibGUI/GAction.h>
#include <LibGUI/GApplication.h>
@ -56,7 +55,7 @@ int main(int argc, char** argv)
auto window = GUI::Window::construct();
window->set_title("PaintBrush");
window->set_rect(100, 100, 640, 480);
window->set_icon(Gfx::load_png("/res/icons/16x16/app-paintbrush.png"));
window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-paintbrush.png"));
auto horizontal_container = GUI::Widget::construct();
window->set_main_widget(horizontal_container);
@ -84,7 +83,7 @@ int main(int argc, char** argv)
if (!open_path.has_value())
return;
auto bitmap = Gfx::load_png(open_path.value());
auto bitmap = Gfx::Bitmap::load_from_file(open_path.value());
if (!bitmap) {
GUI::MessageBox::show(String::format("Failed to load '%s'", open_path.value().characters()), "Open failed", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window);
return;
@ -104,7 +103,7 @@ int main(int argc, char** argv)
auto help_menu = GUI::Menu::construct("Help");
help_menu->add_action(GUI::Action::create("About", [&](auto&) {
GUI::AboutDialog::show("PaintBrush", Gfx::load_png("/res/icons/32x32/app-paintbrush.png"), window);
GUI::AboutDialog::show("PaintBrush", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-paintbrush.png"), window);
}));
menubar->add_menu(move(help_menu));