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

LibGfx: Support vertical gradient fill (not just horizontal) :^)

Browse source
This commit is contained in:
Andreas Kling 2020-03-30 16:59:45 +02:00
parent 098f1cd0ca
commit cbd7effd3b
2 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Libraries/LibGfx/Painter.cpp
View file

@ -141,7 +141,7 @@ void Painter::fill_rect(const Rect& a_rect, Color color)
} }
} }
void Painter::fill_rect_with_gradient(const Rect& a_rect, Color gradient_start, Color gradient_end) void Painter::fill_rect_with_gradient(Orientation orientation, const Rect& a_rect, Color gradient_start, Color gradient_end)
{ {
#ifdef NO_FPU #ifdef NO_FPU
return fill_rect(a_rect, gradient_start); return fill_rect(a_rect, gradient_start);
@ -151,12 +151,12 @@ void Painter::fill_rect_with_gradient(const Rect& a_rect, Color gradient_start,
if (clipped_rect.is_empty()) if (clipped_rect.is_empty())
return; return;
int x_offset = clipped_rect.x() - rect.x(); int offset = clipped_rect.primary_offset_for_orientation(orientation) - rect.primary_offset_for_orientation(orientation);
RGBA32* dst = m_target->scanline(clipped_rect.top()) + clipped_rect.left(); RGBA32* dst = m_target->scanline(clipped_rect.top()) + clipped_rect.left();
const size_t dst_skip = m_target->pitch() / sizeof(RGBA32); const size_t dst_skip = m_target->pitch() / sizeof(RGBA32);
float increment = (1.0 / ((rect.width()) / 255.0)); float increment = (1.0 / ((rect.primary_size_for_orientation(orientation)) / 255.0));
int r2 = gradient_start.red(); int r2 = gradient_start.red();
int g2 = gradient_start.green(); int g2 = gradient_start.green();
@ -165,8 +165,9 @@ void Painter::fill_rect_with_gradient(const Rect& a_rect, Color gradient_start,
int g1 = gradient_end.green(); int g1 = gradient_end.green();
int b1 = gradient_end.blue(); int b1 = gradient_end.blue();
if (orientation == Orientation::Horizontal) {
for (int i = clipped_rect.height() - 1; i >= 0; --i) { for (int i = clipped_rect.height() - 1; i >= 0; --i) {
float c = x_offset * increment; float c = offset * increment;
for (int j = 0; j < clipped_rect.width(); ++j) { for (int j = 0; j < clipped_rect.width(); ++j) {
dst[j] = Color( dst[j] = Color(
r1 / 255.0 * c + r2 / 255.0 * (255 - c), r1 / 255.0 * c + r2 / 255.0 * (255 - c),
@ -177,6 +178,25 @@ void Painter::fill_rect_with_gradient(const Rect& a_rect, Color gradient_start,
} }
dst += dst_skip; dst += dst_skip;
} }
} else {
float c = offset * increment;
for (int i = clipped_rect.height() - 1; i >= 0; --i) {
Color color(
r1 / 255.0 * c + r2 / 255.0 * (255 - c),
g1 / 255.0 * c + g2 / 255.0 * (255 - c),
b1 / 255.0 * c + b2 / 255.0 * (255 - c));
for (int j = 0; j < clipped_rect.width(); ++j) {
dst[j] = color.value();
}
c += increment;
dst += dst_skip;
}
}
}
void Painter::fill_rect_with_gradient(const Rect& a_rect, Color gradient_start, Color gradient_end)
{
return fill_rect_with_gradient(Orientation::Horizontal, a_rect, gradient_start, gradient_end);
} }
void Painter::draw_ellipse_intersecting(const Rect& rect, Color color, int thickness) void Painter::draw_ellipse_intersecting(const Rect& rect, Color color, int thickness)

1
Libraries/LibGfx/Painter.h
View file

@ -45,6 +45,7 @@ public:
~Painter(); ~Painter();
void clear_rect(const Rect&, Color); void clear_rect(const Rect&, Color);
void fill_rect(const Rect&, Color); void fill_rect(const Rect&, Color);
void fill_rect_with_gradient(Orientation, const Rect&, Color gradient_start, Color gradient_end);
void fill_rect_with_gradient(const Rect&, Color gradient_start, Color gradient_end); void fill_rect_with_gradient(const Rect&, Color gradient_start, Color gradient_end);
void draw_rect(const Rect&, Color, bool rough = false); void draw_rect(const Rect&, Color, bool rough = false);
void draw_bitmap(const Point&, const CharacterBitmap&, Color = Color()); void draw_bitmap(const Point&, const CharacterBitmap&, Color = Color());