beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibGfx: Implement scaling support for Painter::blit_filtered()

Browse source 
...and functions implemented in terms of it: blit_brightened(),
blit_dimmed(), blit_disabled().

In theory, this should stop the window server from asserting when
an application becomes unresponsive, but that feature seems to be
broken for unrelated reasons atm (#5111).
This commit is contained in:
Nico Weber 2021-01-25 14:54:38 -05:00 committed by Andreas Kling
parent d348976784
commit 30e19c5a00
Notes: sideshowbarker 2024-07-18 22:51:46 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/30e19c5a006
Pull-request: https://github.com/SerenityOS/serenity/pull/5113
2 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Userland/Demos/LibGfxScaleDemo/main.cpp
View file

@ -113,6 +113,10 @@ void Canvas::draw(Gfx::Painter& painter)
ASSERT(!grid->has_alpha_channel());
painter.fill_rect({ 25, 122, 62, 20 }, Color::Green);
painter.blit({ 25, 122 }, *grid, { (grid->width() - 62) / 2, (grid->height() - 20) / 2 + 40, 62, 20 }, 0.9);
painter.blit_brightened({ 88, 122 }, *buggie, { 2, 30, 62, 20 });
painter.blit_dimmed({ 140, 122 }, *buggie, { 2, 30, 62, 20 });
painter.blit_disabled({ 192, 122 }, *buggie, { 2, 30, 62, 20 }, palette());
}
int main(int argc, char** argv)

54
Userland/Libraries/LibGfx/Painter.cpp
View file

@ -562,34 +562,58 @@ void Painter::blit_with_opacity(const IntPoint& position, const Gfx::Bitmap& sou
void Painter::blit_filtered(const IntPoint& position, const Gfx::Bitmap& source, const IntRect& src_rect, Function<Color(Color)> filter)
{
ASSERT(scale() == 1); // FIXME: Add scaling support.
ASSERT((source.scale() == 1 || source.scale() == scale()) && "blit_filtered only supports integer upsampling");
IntRect safe_src_rect = src_rect.intersected(source.rect());
auto dst_rect = IntRect(position, safe_src_rect.size()).translated(translation());
auto clipped_rect = dst_rect.intersected(clip_rect());
if (clipped_rect.is_empty())
return;
int scale = this->scale();
clipped_rect *= scale;
dst_rect *= scale;
safe_src_rect *= source.scale();
const int first_row = clipped_rect.top() - dst_rect.top();
const int last_row = clipped_rect.bottom() - dst_rect.top();
const int first_column = clipped_rect.left() - dst_rect.left();
const int last_column = clipped_rect.right() - dst_rect.left();
RGBA32* dst = m_target->scanline(clipped_rect.y()) + clipped_rect.x();
const RGBA32* src = source.scanline(src_rect.top() + first_row) + src_rect.left() + first_column;
const size_t dst_skip = m_target->pitch() / sizeof(RGBA32);
const size_t src_skip = source.pitch() / sizeof(RGBA32);
for (int row = first_row; row <= last_row; ++row) {
for (int x = 0; x <= (last_column - first_column); ++x) {
u8 alpha = Color::from_rgba(src[x]).alpha();
if (alpha == 0xff)
dst[x] = filter(Color::from_rgba(src[x])).value();
else if (!alpha)
continue;
else
dst[x] = Color::from_rgba(dst[x]).blend(filter(Color::from_rgba(src[x]))).value();
int s = scale / source.scale();
if (s == 1) {
const RGBA32* src = source.scanline(safe_src_rect.top() + first_row) + safe_src_rect.left() + first_column;
const size_t src_skip = source.pitch() / sizeof(RGBA32);
for (int row = first_row; row <= last_row; ++row) {
for (int x = 0; x <= (last_column - first_column); ++x) {
u8 alpha = Color::from_rgba(src[x]).alpha();
if (alpha == 0xff)
dst[x] = filter(Color::from_rgba(src[x])).value();
else if (!alpha)
continue;
else
dst[x] = Color::from_rgba(dst[x]).blend(filter(Color::from_rgba(src[x]))).value();
}
dst += dst_skip;
src += src_skip;
}
} else {
for (int row = first_row; row <= last_row; ++row) {
const RGBA32* src = source.scanline(safe_src_rect.top() + row / s) + safe_src_rect.left() + first_column / s;
for (int x = 0; x <= (last_column - first_column); ++x) {
u8 alpha = Color::from_rgba(src[x / s]).alpha();
if (alpha == 0xff)
dst[x] = filter(Color::from_rgba(src[x / s])).value();
else if (!alpha)
continue;
else
dst[x] = Color::from_rgba(dst[x]).blend(filter(Color::from_rgba(src[x / s]))).value();
}
dst += dst_skip;
}
dst += dst_skip;
src += src_skip;
}
}
@ -1698,8 +1722,6 @@ void Painter::fill_path(Path& path, Color color, WindingRule winding_rule)
void Painter::blit_disabled(const IntPoint& location, const Gfx::Bitmap& bitmap, const IntRect& rect, const Palette& palette)
{
ASSERT(scale() == 1); // FIXME: Add scaling support.
auto bright_color = palette.threed_highlight();
auto dark_color = palette.threed_shadow1();
blit_filtered(location.translated(1, 1), bitmap, rect, [&](auto) {