fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 14:18:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

New nodes: 'Gradient Reverse', 'Gradient Shift', and 'Gradient Stretch' nodes for rearranging a ramp's stops (#4424)

Browse Source 
* New nodes: 'Gradient Reverse', 'Gradient Shift', and 'Gradient Stretch' nodes for rearranging a ramp's stops

* Clip a lone out-of-range stop into the bake, and correct the docs that still promised edge-held stops
This commit is contained in:
Keavon Chambers
2026-08-08 03:09:06 -07:00
committed by GitHub
parent c75c6c9695
commit ceb2de51fb
7 changed files with 451 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/src/messages/layout/utility_types/widgets/input_widgets.rs
View File

@@ -645,7 +645,8 @@ pub struct SpectrumInput {
#[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
#[derive(Clone, Debug, Default, PartialEq, serde::Serialize, serde::Deserialize)]
pub struct SpectrumMarker {
/// Position (0..1) of the marker along the spectrum track.
/// Position of the marker along the spectrum track, normally from 0 to 1. A shifted or stretched non-cyclic ramp can
/// place it outside that range, where the track draws only the markers falling within its visible span.
position: f64,
/// Position (0..1) of the midpoint between this marker and the next, used only if `show_midpoints` is true.
/// The last marker's value controls the wrapped interval when `track_cyclic` is set, and is otherwise ignored.

16
editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs
View File

@@ -25,7 +25,7 @@ use graphene_std::vector::misc::{
ArcType, BooleanOperation, BoxCorners, CentroidType, ExtrudeJoiningAlgorithm, GridType, InterpolationDistribution, MergeByDistanceAlgorithm, PointSpacingType, RowsOrColumns, SpiralType,
};
use graphene_std::vector::style::{
DashPattern, FillChoice, GradientForm, GradientHueDirection, GradientInterpolation, GradientRamp, GradientSpace, GradientSpread, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin,
DashPattern, FillChoice, GradientForm, GradientHueDirection, GradientInterpolation, GradientRamp, GradientSettings, GradientSpace, GradientSpread, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin,
};
use graphene_std::vector::{QRCodeErrorCorrectionLevel, Vector};
use graphene_std::{Artboard, Color, Context, Graphic};
@@ -102,6 +102,7 @@ impl DataPanelMessageHandler {
desired_path: &mut self.element_path,
network_interface: &*network_interface,
node_lookup_network_path: Vec::new(),
gradient_settings: GradientSettings::default(),
breadcrumbs: Vec::new(),
vector_table_tab: self.active_vector_table_tab,
};
@@ -173,6 +174,9 @@ struct LayoutData<'a> {
/// Defaults to root (`&[]`); `List<NodeId>` rendering temporarily sets it to the path's prefix so nested
/// layers (e.g. inside a Ctrl+M-merged custom subgraph) resolve correctly.
node_lookup_network_path: Vec<NodeId>,
/// The whole-ramp settings to preview a `Gradient` element with, since they live in the attributes beside it
/// rather than in the stop list itself. The enclosing `Item`/`List` sets it to the owning row's attributes.
gradient_settings: GradientSettings,
breadcrumbs: Vec<String>,
vector_table_tab: VectorTableTab,
}
@@ -385,7 +389,10 @@ impl<T: TableItemLayout> TableItemLayout for Item<T> {
let attribute_keys: Vec<String> = self.attributes().keys().map(str::to_string).collect();
// A single element, so no leading ID column, unlike the `List` table
let saved_gradient_settings = data.gradient_settings;
data.gradient_settings = GradientSettings::from_item_attributes(self);
let mut values = vec![self.element().value_widgets(PathStep::Element(0), data)];
data.gradient_settings = saved_gradient_settings;
for key in &attribute_keys {
let target = PathStep::Attribute { row: 0, key: key.clone() };
let cell = self.attributes().get_any(key).and_then(|any| dispatch_value_widgets(any, target, data)).unwrap_or_else(|| {
@@ -443,10 +450,13 @@ impl<T: TableItemLayout> TableItemLayout for List<T> {
let mut rows = (0..self.len())
.map(|index| {
let element = self.element(index).unwrap();
let saved_gradient_settings = data.gradient_settings;
data.gradient_settings = GradientSettings::from_list_row_attributes(self, index);
let mut values = vec![
vec![TextLabel::new(format!("{index}")).narrow(true).widget_instance()],
element.value_widgets(PathStep::Element(index), data),
];
data.gradient_settings = saved_gradient_settings;
for key in &attribute_keys {
let target = PathStep::Attribute { row: index, key: key.clone() };
let cell = self.attribute_any(key, index).and_then(|any| dispatch_value_widgets(any, target, data)).unwrap_or_else(|| {
@@ -752,14 +762,14 @@ impl TableItemLayout for Gradient {
self.value_page(data)
}
// The preview widget doesn't navigate, so a drill-in button beside it opens the newtype's underlying color list
fn value_widgets(&self, target: PathStep, _data: &LayoutData) -> Vec<WidgetInstance> {
fn value_widgets(&self, target: PathStep, data: &LayoutData) -> Vec<WidgetInstance> {
vec![
TextButton::new(self.as_color_list().identifier())
.on_update(move |_| DataPanelMessage::PushToElementPath { step: target.clone() }.into())
.narrow(true)
.widget_instance(),
Separator::new(SeparatorStyle::Related).widget_instance(),
ColorInput::new(FillChoice::<SRGBA8>::Gradient(GradientRamp::from(self)))
ColorInput::new(FillChoice::<SRGBA8>::Gradient(GradientRamp::from(self).with_settings(data.gradient_settings)))
.menu_direction(Some(MenuDirection::Top))
.disabled(true)
.narrow(true)