Skip to content

Make the Gradient tool default to the primary/secondary working colors as its initial gradient #4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keavon merged 2 commits into from
May 7, 2026
Merged

Make the Gradient tool default to the primary/secondary working colors as its initial gradient #4119

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c93cd7d
Make the Gradient tool default to the primary/secondary working color…
Keavon May 7, 2026
64e786d
Fix drawing direction
Keavon May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 42 additions & 15 deletions editor/src/messages/tool/tool_messages/gradient_tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::messages::tool::common_functionality::graph_modification_utils::{self
use crate::messages::tool::common_functionality::snapping::{SnapCandidatePoint, SnapConstraint, SnapData, SnapManager, SnapTypeConfiguration};
use graph_craft::document::value::TaggedValue;
use graphene_std::raster::color::Color;
use graphene_std::vector::style::{Fill, FillChoice, Gradient, GradientSpreadMethod, GradientStops, GradientType};
use graphene_std::vector::style::{Fill, FillChoice, Gradient, GradientSpreadMethod, GradientStop, GradientStops, GradientType};

#[derive(Default, ExtractField)]
pub struct GradientTool {
Expand All @@ -35,6 +35,7 @@ pub enum GradientToolMessage {
Abort,
Overlays { context: OverlayContext },
SelectionChanged,
WorkingColorChanged,

// Tool-specific messages
DeleteStop,
Expand Down Expand Up @@ -128,6 +129,19 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Grad
}
self.data.color_picker_editing_color_stop = None;
}
ToolMessage::Gradient(GradientToolMessage::WorkingColorChanged) => {
let primary = context.global_tool_data.primary_color;
let secondary = context.global_tool_data.secondary_color;

if self.data.primary_color != primary || self.data.secondary_color != secondary {
self.data.primary_color = primary;
self.data.secondary_color = secondary;

if !self.data.has_selected_gradient {
responses.add(ToolMessage::RefreshToolOptions);
}
}
}
_ => {
self.fsm_state.process_event(message, &mut self.data, context, &self.options, responses, false);

Expand Down Expand Up @@ -208,12 +222,20 @@ impl LayoutHolder for GradientTool {
.selected_index(Some((self.options.gradient_type == GradientType::Radial) as u32))
.widget_instance();

let stops_value = self
.data
.current_gradient_stops
.clone()
.map(FillChoice::Gradient)
.unwrap_or(FillChoice::Gradient(GradientStops::default()));
let stops_value = self.data.current_gradient_stops.clone().map(FillChoice::Gradient).unwrap_or_else(|| {
FillChoice::Gradient(GradientStops::new([
GradientStop {
position: 0.,
midpoint: 0.5,
color: self.data.primary_color,
},
GradientStop {
position: 1.,
midpoint: 0.5,
color: self.data.secondary_color,
},
]))
});
Comment thread
Keavon marked this conversation as resolved.
let stops_widget = ColorInput::new(stops_value)
.allow_none(false)
.disabled(!self.data.has_selected_gradient)
Expand Down Expand Up @@ -749,6 +771,7 @@ impl ToolTransition for GradientTool {
EventToMessageMap {
tool_abort: Some(GradientToolMessage::Abort.into()),
selection_changed: Some(GradientToolMessage::SelectionChanged.into()),
working_color_changed: Some(GradientToolMessage::WorkingColorChanged.into()),
overlay_provider: Some(|context| GradientToolMessage::Overlays { context }.into()),
..Default::default()
}
Expand All @@ -770,6 +793,9 @@ struct GradientToolData {
/// Cached viewport-space orientation (true = predominantly rightward) of the selected gradient line.
/// Used to refresh the control bar's "Reverse Direction" icon only when the line's apparent direction flips.
gradient_orientation_rightward: bool,
/// Cached working colors, mirrored from `DocumentToolData` via the `WorkingColorChanged` event, used as the default gradient colors.
primary_color: Color,
secondary_color: Color,
Comment thread
Keavon marked this conversation as resolved.
color_picker_editing_color_stop: Option<usize>,
color_picker_transaction_open: bool,
}
Expand Down Expand Up @@ -1377,16 +1403,17 @@ impl Fsm for GradientToolFsmState {
responses.add(NodeGraphMessage::SelectedNodesSet { nodes });
}

// Use the already existing gradient if it exists
let gradient = if let Some(gradient) = get_gradient(layer, &document.network_interface) {
// Use the already existing gradient if it exists
gradient.clone()
} else {
// Generate a new gradient
// Generate a new gradient running primary → secondary so the default working colors
// (primary = black, secondary = white) produce the expected black-to-white gradient
Gradient::new(
DVec2::ZERO,
global_tool_data.secondary_color,
DVec2::ONE,
global_tool_data.primary_color,
DVec2::ONE,
global_tool_data.secondary_color,
tool_options.gradient_type,
tool_options.spread_method,
)
Expand Down Expand Up @@ -1976,9 +2003,9 @@ mod test_gradient {

let (gradient, transform) = get_gradient(&mut editor).await;

// Gradient goes from secondary color to primary color
// Gradient goes from primary color to secondary color
let stops = gradient.stops.iter().map(|stop| (stop.position, stop.color.to_rgba8_srgb())).collect::<Vec<_>>();
assert_eq!(stops, vec![(0., Color::BLUE.to_rgba8_srgb()), (1., Color::GREEN.to_rgba8_srgb())]);
assert_eq!(stops, vec![(0., Color::GREEN.to_rgba8_srgb()), (1., Color::BLUE.to_rgba8_srgb())]);
assert!(transform.transform_point2(gradient.start).abs_diff_eq(DVec2::new(2., 3.), 1e-10));
assert!(transform.transform_point2(gradient.end).abs_diff_eq(DVec2::new(24., 4.), 1e-10));
}
Expand Down Expand Up @@ -2211,9 +2238,9 @@ mod test_gradient {
assert_stops_at_positions(&updated_positions, &[0., 0.8, 1.], 0.1);

// Colors should maintain their associations with the stop points
assert_eq!(updated_stops.color[0].to_rgba8_srgb(), Color::BLUE.to_rgba8_srgb());
assert_eq!(updated_stops.color[0].to_rgba8_srgb(), Color::GREEN.to_rgba8_srgb());
assert_eq!(updated_stops.color[1].to_rgba8_srgb(), middle_color);
assert_eq!(updated_stops.color[2].to_rgba8_srgb(), Color::GREEN.to_rgba8_srgb());
assert_eq!(updated_stops.color[2].to_rgba8_srgb(), Color::BLUE.to_rgba8_srgb());
}

#[tokio::test]
Expand Down
Loading