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

Base+PixelPaint: Use Merge Active Layer Up/Down Icons

Browse source 
The icons for these actions were added in a previous commit but never
used, now they are.
This commit is contained in:
electrikmilk 2022-02-14 23:51:05 -05:00 • committed by Andreas Kling
parent 7e5b3ce26b
commit 97ce19bc68
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/PixelPaint/IconBag.cpp
View file

@ -36,6 +36,8 @@ ErrorOr<IconBag> IconBag::try_create()
icon_bag.active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-down.png")); icon_bag.active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-down.png"));
icon_bag.delete_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png")); icon_bag.delete_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png"));
icon_bag.merge_visible = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-visible.png")); icon_bag.merge_visible = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-visible.png"));
icon_bag.merge_active_layer_up = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-active-layer-up.png"));
icon_bag.merge_active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-active-layer-down.png"));
icon_bag.filter = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/filter.png")); icon_bag.filter = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/filter.png"));
return icon_bag; return icon_bag;

2
Userland/Applications/PixelPaint/IconBag.h
View file

@ -37,6 +37,8 @@ struct IconBag final {
RefPtr<Gfx::Bitmap> active_layer_down { nullptr }; RefPtr<Gfx::Bitmap> active_layer_down { nullptr };
RefPtr<Gfx::Bitmap> delete_layer { nullptr }; RefPtr<Gfx::Bitmap> delete_layer { nullptr };
RefPtr<Gfx::Bitmap> merge_visible { nullptr }; RefPtr<Gfx::Bitmap> merge_visible { nullptr };
RefPtr<Gfx::Bitmap> merge_active_layer_up { nullptr };
RefPtr<Gfx::Bitmap> merge_active_layer_down { nullptr };
RefPtr<Gfx::Bitmap> filter { nullptr }; RefPtr<Gfx::Bitmap> filter { nullptr };
}; };
} }

4
Userland/Applications/PixelPaint/MainWidget.cpp
View file

@ -592,7 +592,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
})); }));
m_layer_menu->add_action(GUI::Action::create( m_layer_menu->add_action(GUI::Action::create(
"Merge &Active Layer Up", [&](auto&) { "Merge &Active Layer Up", g_icon_bag.merge_active_layer_up, [&](auto&) {
auto* editor = current_image_editor(); auto* editor = current_image_editor();
VERIFY(editor); VERIFY(editor);
auto active_layer = editor->active_layer(); auto active_layer = editor->active_layer();
@ -603,7 +603,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
})); }));
m_layer_menu->add_action(GUI::Action::create( m_layer_menu->add_action(GUI::Action::create(
"M&erge Active Layer Down", { Mod_Ctrl, Key_E }, [&](auto&) { "M&erge Active Layer Down", { Mod_Ctrl, Key_E }, g_icon_bag.merge_active_layer_down, [&](auto&) {
auto* editor = current_image_editor(); auto* editor = current_image_editor();
VERIFY(editor); VERIFY(editor);
auto active_layer = editor->active_layer(); auto active_layer = editor->active_layer();