From 6551a0b2ab6c831dd1d3646ecf55180339275e22 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 11 May 2023 09:12:06 -0700
Subject: Added support for gradients as background variants + other
 optimizations.

---
 tiny_skia/src/geometry.rs | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'tiny_skia/src/geometry.rs')

diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index a1fd7b60..100db0b0 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -1,8 +1,8 @@
-use crate::core::Gradient;
 use crate::core::{Point, Rectangle, Size, Vector};
 use crate::graphics::geometry::fill::{self, Fill};
 use crate::graphics::geometry::stroke::{self, Stroke};
 use crate::graphics::geometry::{Path, Style, Text};
+use crate::graphics::Gradient;
 use crate::graphics::Primitive;
 
 pub struct Frame {
@@ -231,18 +231,11 @@ pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
                     .expect("Create color"),
             ),
             Style::Gradient(gradient) => match gradient {
-                Gradient::Linear(linear) => tiny_skia::LinearGradient::new(
-                    tiny_skia::Point {
-                        x: linear.start.x,
-                        y: linear.start.y,
-                    },
-                    tiny_skia::Point {
-                        x: linear.end.x,
-                        y: linear.end.y,
-                    },
-                    linear
+                Gradient::Linear(linear) => {
+                    let stops: Vec<tiny_skia::GradientStop> = linear
                         .color_stops
                         .into_iter()
+                        .flatten()
                         .map(|stop| {
                             tiny_skia::GradientStop::new(
                                 stop.offset,
@@ -255,11 +248,30 @@ pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
                                 .expect("Create color"),
                             )
                         })
-                        .collect(),
-                    tiny_skia::SpreadMode::Pad,
-                    tiny_skia::Transform::identity(),
-                )
-                .expect("Create linear gradient"),
+                        .collect();
+
+                    tiny_skia::LinearGradient::new(
+                        tiny_skia::Point {
+                            x: linear.start.x,
+                            y: linear.start.y,
+                        },
+                        tiny_skia::Point {
+                            x: linear.end.x,
+                            y: linear.end.y,
+                        },
+                        if stops.is_empty() {
+                            vec![tiny_skia::GradientStop::new(
+                                0.0,
+                                tiny_skia::Color::BLACK,
+                            )]
+                        } else {
+                            stops
+                        },
+                        tiny_skia::SpreadMode::Pad,
+                        tiny_skia::Transform::identity(),
+                    )
+                    .expect("Create linear gradient")
+                }
             },
         },
         anti_alias: true,
-- 
cgit 


From 4c1a082f0468a59099bbf8aa8991420a41234948 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 19 May 2023 03:32:21 +0200
Subject: Remove `Builder` abstractions for gradients

---
 tiny_skia/src/geometry.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tiny_skia/src/geometry.rs')

diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index 100db0b0..ee347c73 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -233,7 +233,7 @@ pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
             Style::Gradient(gradient) => match gradient {
                 Gradient::Linear(linear) => {
                     let stops: Vec<tiny_skia::GradientStop> = linear
-                        .color_stops
+                        .stops
                         .into_iter()
                         .flatten()
                         .map(|stop| {
-- 
cgit