[librsvg: 2/11] Rename GradientVariant to ResolvedGradientVariant
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/11] Rename GradientVariant to ResolvedGradientVariant
- Date: Tue, 1 Dec 2020 18:24:44 +0000 (UTC)
commit 33b75907c483670e5bfa0b668d774ed996bcf756
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Nov 30 20:24:29 2020 -0600
Rename GradientVariant to ResolvedGradientVariant
src/drawing_ctx.rs | 6 +++---
src/gradient.rs | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/drawing_ctx.rs b/src/drawing_ctx.rs
index 9069f581..9fe4175d 100644
--- a/src/drawing_ctx.rs
+++ b/src/drawing_ctx.rs
@@ -20,7 +20,7 @@ use crate::error::{AcquireError, RenderingError};
use crate::filter::FilterValue;
use crate::filters;
use crate::float_eq_cairo::ApproxEqCairo;
-use crate::gradient::{GradientUnits, GradientVariant, ResolvedGradient, SpreadMethod};
+use crate::gradient::{GradientUnits, ResolvedGradient, ResolvedGradientVariant, SpreadMethod};
use crate::marker;
use crate::node::{CascadedValues, Node, NodeBorrow, NodeDraw};
use crate::paint_server::{PaintServer, PaintSource};
@@ -951,7 +951,7 @@ impl DrawingCtx {
let params = self.push_coord_units(units);
let g = match gradient.get_variant() {
- GradientVariant::Linear { x1, y1, x2, y2 } => {
+ ResolvedGradientVariant::Linear { x1, y1, x2, y2 } => {
cairo::Gradient::clone(&cairo::LinearGradient::new(
x1.normalize(values, ¶ms),
y1.normalize(values, ¶ms),
@@ -960,7 +960,7 @@ impl DrawingCtx {
))
}
- GradientVariant::Radial {
+ ResolvedGradientVariant::Radial {
cx,
cy,
r,
diff --git a/src/gradient.rs b/src/gradient.rs
index 861dd988..e0f28931 100644
--- a/src/gradient.rs
+++ b/src/gradient.rs
@@ -121,7 +121,7 @@ enum UnresolvedVariant {
/// Parameters specific to each gradient type, after resolving.
#[derive(Clone)]
-pub enum GradientVariant {
+pub enum ResolvedGradientVariant {
Linear {
x1: Length<Horizontal>,
y1: Length<Vertical>,
@@ -140,11 +140,11 @@ pub enum GradientVariant {
}
impl UnresolvedVariant {
- fn into_resolved(self) -> GradientVariant {
+ fn into_resolved(self) -> ResolvedGradientVariant {
assert!(self.is_resolved());
match self {
- UnresolvedVariant::Linear { x1, y1, x2, y2 } => GradientVariant::Linear {
+ UnresolvedVariant::Linear { x1, y1, x2, y2 } => ResolvedGradientVariant::Linear {
x1: x1.unwrap(),
y1: y1.unwrap(),
x2: x2.unwrap(),
@@ -158,7 +158,7 @@ impl UnresolvedVariant {
fx,
fy,
fr,
- } => GradientVariant::Radial {
+ } => ResolvedGradientVariant::Radial {
cx: cx.unwrap(),
cy: cy.unwrap(),
r: r.unwrap(),
@@ -338,7 +338,7 @@ pub struct ResolvedGradient {
spread: SpreadMethod,
stops: Vec<ColorStop>,
- variant: GradientVariant,
+ variant: ResolvedGradientVariant,
}
impl UnresolvedGradient {
@@ -680,7 +680,7 @@ impl ResolvedGradient {
&self.stops
}
- pub fn get_variant(&self) -> &GradientVariant {
+ pub fn get_variant(&self) -> &ResolvedGradientVariant {
&self.variant
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]