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

PixelPaint: Use editing masks in filter gallery

Browse source 
With this change the image modifications of a filter is only applied to
regions of the image where a editing mask is defined. If no editing
mask is defined the filter modifications are applied to the whole
image.
This commit is contained in:
Torstennator 2023-06-17 13:12:25 +02:00 • committed by Jelle Raaijmakers
parent dbbf54df2c
commit df4904f61d
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Applications/PixelPaint/ImageProcessor.cpp
View file

@ -5,6 +5,7 @@
*/ */
#include "ImageProcessor.h" #include "ImageProcessor.h"
#include "Layer.h"
namespace PixelPaint { namespace PixelPaint {
@ -16,7 +17,18 @@ FilterApplicationCommand::FilterApplicationCommand(NonnullRefPtr<Filter> filter,
void FilterApplicationCommand::execute() void FilterApplicationCommand::execute()
{ {
m_filter->apply(m_target_layer->get_scratch_edited_bitmap(), m_target_layer->get_scratch_edited_bitmap()); if (m_target_layer->mask_type() == Layer::MaskType::EditingMask && m_target_layer->edit_mode() == Layer::EditMode::Content) {
auto unchanged_source = m_target_layer->get_scratch_edited_bitmap().clone().release_value_but_fixme_should_propagate_errors();
m_filter->apply(m_target_layer->get_scratch_edited_bitmap(), m_target_layer->get_scratch_edited_bitmap());
for (int y = 0; y < m_target_layer->content_bitmap().height(); y++)
for (int x = 0; x < m_target_layer->content_bitmap().width(); x++)
m_target_layer->content_bitmap().set_pixel(x, y, m_target_layer->modify_pixel_with_editing_mask(x, y, m_target_layer->content_bitmap().get_pixel(x, y), unchanged_source->get_pixel(x, y)));
} else {
m_filter->apply(m_target_layer->get_scratch_edited_bitmap(), m_target_layer->get_scratch_edited_bitmap());
}
m_filter->m_editor->gui_event_loop().deferred_invoke([strong_this = NonnullRefPtr(*this)]() { m_filter->m_editor->gui_event_loop().deferred_invoke([strong_this = NonnullRefPtr(*this)]() {
// HACK: we can't tell strong_this to not be const // HACK: we can't tell strong_this to not be const
(*const_cast<NonnullRefPtr<Layer>*>(&strong_this->m_target_layer))->did_modify_bitmap(strong_this->m_target_layer->rect()); (*const_cast<NonnullRefPtr<Layer>*>(&strong_this->m_target_layer))->did_modify_bitmap(strong_this->m_target_layer->rect());