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

LibWeb: Update CRC2D .fillStyle and .strokeStyle to accept gradients

Browse source 
While doing add some structures to hold these new fill styles and
plumb them over to the painter.
This commit is contained in:
MacDue 2023-01-18 20:10:00 +01:00 • committed by Andreas Kling
parent 2be4142138
commit 24cb57ac88
5 changed files with 89 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibWeb/HTML/Canvas/CanvasFillStrokeStyles.h
View file

@ -2,6 +2,7 @@
* Copyright (c) 2020-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021-2022, Linus Groh <linusg@serenityos.org>
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2023, MacDue <macdue@dueutil.tech>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -19,27 +20,39 @@ template<typename IncludingClass>
class CanvasFillStrokeStyles {
public:
~CanvasFillStrokeStyles() = default;
using FillOrStrokeStyleVariant = Variant<DeprecatedString, JS::Handle<CanvasGradient>>;
void set_fill_style(DeprecatedString style)
static CanvasState::FillOrStrokeStyle to_canvas_state_fill_or_stoke_style(auto const& style)
{
return style.visit(
[&](DeprecatedString const& string) -> CanvasState::FillOrStrokeStyle {
return Gfx::Color::from_string(string).value_or(Color::Black);
},
[&](JS::Handle<CanvasGradient> gradient) -> CanvasState::FillOrStrokeStyle {
return gradient;
});
}
void set_fill_style(FillOrStrokeStyleVariant style)
{
// FIXME: 2. If the given value is a CanvasPattern object that is marked as not origin-clean, then set this's origin-clean flag to false.
my_drawing_state().fill_style = Gfx::Color::from_string(style).value_or(Color::Black);
my_drawing_state().fill_style = to_canvas_state_fill_or_stoke_style(style);
}
DeprecatedString fill_style() const
FillOrStrokeStyleVariant fill_style() const
{
return my_drawing_state().fill_style.to_deprecated_string();
return my_drawing_state().fill_style.to_js_fill_or_stoke_style();
}
void set_stroke_style(DeprecatedString style)
void set_stroke_style(FillOrStrokeStyleVariant style)
{
// FIXME: 2. If the given value is a CanvasPattern object that is marked as not origin-clean, then set this's origin-clean flag to false.
my_drawing_state().stroke_style = Gfx::Color::from_string(style).value_or(Color::Black);
my_drawing_state().stroke_style = to_canvas_state_fill_or_stoke_style(style);
}
DeprecatedString stroke_style() const
FillOrStrokeStyleVariant stroke_style() const
{
return my_drawing_state().stroke_style.to_deprecated_string();
return my_drawing_state().stroke_style.to_js_fill_or_stoke_style();
}
JS::NonnullGCPtr<CanvasGradient> create_radial_gradient(double x0, double y0, double r0, double x1, double y1, double r1)