RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 09:18:11 +00:00
Code Issues Activity Actions

PixelPaint: Reduce verbosity of crop to content feature

Browse source 
This patch reduces the repetitiveness of the crop to content feature
implementation.
This commit is contained in:
faxe1008 2022-08-24 22:46:54 +02:00 • committed by Andreas Kling
parent d5de9bcc51
commit 21358d8a5f
2 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -540,7 +540,7 @@ Optional<Gfx::IntRect> Image::nonempty_content_bounding_rect() const
auto layer_content_rect_in_layer_coordinates = layer.nonempty_content_bounding_rect();
if (!layer_content_rect_in_layer_coordinates.has_value())
continue;
auto layer_content_rect_in_image_coordinates = layer_content_rect_in_layer_coordinates.value().translated(layer.location());
auto layer_content_rect_in_image_coordinates = layer_content_rect_in_layer_coordinates->translated(layer.location());
if (!bounding_rect.has_value())
bounding_rect = layer_content_rect_in_image_coordinates;
else

24
Userland/Applications/PixelPaint/Layer.cpp
View file

@ -281,26 +281,10 @@ Optional<Gfx::IntRect> Layer::nonempty_content_bounding_rect() const
auto color = m_content_bitmap->get_pixel(x, y);
if (color.alpha() == 0)
continue;
if (!min_content_x.has_value())
min_content_x = x;
else
min_content_x = min(*min_content_x, x);
if (!min_content_y.has_value())
min_content_y = y;
else
min_content_y = min(*min_content_y, y);
if (!max_content_x.has_value())
max_content_x = x;
else
max_content_x = max(*max_content_x, x);
if (!max_content_y.has_value())
max_content_y = y;
else
max_content_y = max(*max_content_y, y);
min_content_x = min(min_content_x.value_or(x), x);
min_content_y = min(min_content_y.value_or(y), y);
max_content_x = max(max_content_x.value_or(x), x);
max_content_y = max(max_content_y.value_or(y), y);
}
}