mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 21:07:35 +00:00
LibGfx: Use ErrorOr<T> for Bitmap::try_load_from_file()
This was used in a lot of places, so this patch makes liberal use of ErrorOr<T>::release_value_but_fixme_should_propagate_errors().
This commit is contained in:
parent
16f064d9be
commit
235f39e449
104 changed files with 412 additions and 397 deletions
|
@ -28,49 +28,49 @@ static String default_window_icon_path()
|
|||
|
||||
static Gfx::Bitmap& default_window_icon()
|
||||
{
|
||||
static Gfx::Bitmap* s_icon;
|
||||
static RefPtr<Gfx::Bitmap> s_icon;
|
||||
if (!s_icon)
|
||||
s_icon = Gfx::Bitmap::try_load_from_file(default_window_icon_path()).leak_ref();
|
||||
s_icon = Gfx::Bitmap::try_load_from_file(default_window_icon_path()).release_value_but_fixme_should_propagate_errors();
|
||||
return *s_icon;
|
||||
}
|
||||
|
||||
static Gfx::Bitmap& minimize_icon()
|
||||
{
|
||||
static Gfx::Bitmap* s_icon;
|
||||
static RefPtr<Gfx::Bitmap> s_icon;
|
||||
if (!s_icon)
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/downward-triangle.png").leak_ref();
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/downward-triangle.png").release_value_but_fixme_should_propagate_errors();
|
||||
return *s_icon;
|
||||
}
|
||||
|
||||
static Gfx::Bitmap& maximize_icon()
|
||||
{
|
||||
static Gfx::Bitmap* s_icon;
|
||||
static RefPtr<Gfx::Bitmap> s_icon;
|
||||
if (!s_icon)
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/upward-triangle.png").leak_ref();
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/upward-triangle.png").release_value_but_fixme_should_propagate_errors();
|
||||
return *s_icon;
|
||||
}
|
||||
|
||||
static Gfx::Bitmap& restore_icon()
|
||||
{
|
||||
static Gfx::Bitmap* s_icon;
|
||||
static RefPtr<Gfx::Bitmap> s_icon;
|
||||
if (!s_icon)
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window-restore.png").leak_ref();
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window-restore.png").release_value_but_fixme_should_propagate_errors();
|
||||
return *s_icon;
|
||||
}
|
||||
|
||||
static Gfx::Bitmap& close_icon()
|
||||
{
|
||||
static Gfx::Bitmap* s_icon;
|
||||
static RefPtr<Gfx::Bitmap> s_icon;
|
||||
if (!s_icon)
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window-close.png").leak_ref();
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window-close.png").release_value_but_fixme_should_propagate_errors();
|
||||
return *s_icon;
|
||||
}
|
||||
|
||||
static Gfx::Bitmap& pin_icon()
|
||||
{
|
||||
static Gfx::Bitmap* s_icon;
|
||||
static RefPtr<Gfx::Bitmap> s_icon;
|
||||
if (!s_icon)
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window-pin.png").leak_ref();
|
||||
s_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window-pin.png").release_value_but_fixme_should_propagate_errors();
|
||||
return *s_icon;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue