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

LibGUI: Add ErrorOr wrapper for default icon creation

Browse source
This commit is contained in:
Astraeus- 2021-12-15 17:20:55 +01:00 • committed by Brian Gianforcaro
parent 42b06d5f7d
commit 61fed26400
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibGUI/Icon.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Julius Heijmen <julius.heijmen@gmail.com>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -83,4 +84,12 @@ Icon Icon::default_icon(StringView name)
return Icon(move(bitmap16), move(bitmap32)); return Icon(move(bitmap16), move(bitmap32));
} }
ErrorOr<Icon> Icon::try_create_default_icon(StringView name)
{
RefPtr<Gfx::Bitmap> bitmap16 = TRY(Gfx::Bitmap::try_load_from_file(String::formatted("/res/icons/16x16/{}.png", name)));
RefPtr<Gfx::Bitmap> bitmap32 = TRY(Gfx::Bitmap::try_load_from_file(String::formatted("/res/icons/32x32/{}.png", name)));
return Icon(move(bitmap16), move(bitmap32));
}
} }

2
Userland/Libraries/LibGUI/Icon.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Julius Heijmen <julius.heijmen@gmail.com>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -44,6 +45,7 @@ public:
~Icon() { } ~Icon() { }
static Icon default_icon(StringView); static Icon default_icon(StringView);
static ErrorOr<Icon> try_create_default_icon(StringView);
Icon& operator=(const Icon& other) Icon& operator=(const Icon& other)
{ {