Skip to content

Fix fill color backup not capturing most recent color selection #3918

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

Open
ziad-ashraf7 wants to merge 3 commits into
base: master
Choose a base branch
from
+11 −5
Open

Fix fill color backup not capturing most recent color selection #3918

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2813c5
FIX: fixed the color picker bug
ziad-ashraf7 Mar 19, 2026
7d28d12
Merge branch 'master' into fix-color-picker-radial-hue
ziad-ashraf7 Mar 19, 2026
9393d47
Fix gradient type/orientation metadata preservation in backup
ziad-ashraf7 Mar 19, 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
16 changes: 11 additions & 5 deletions editor/src/messages/portfolio/document/node_graph/node_properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,7 @@ pub(crate) fn fill_properties(node_id: NodeId, context: &mut NodePropertiesConte
return vec![LayoutGroup::row(widgets_first_row)];
};
let fill2 = fill.clone();
let backup_gradient2 = backup_gradient.clone();
let backup_color_fill: Fill = backup_color.clone().into();
let backup_gradient_fill: Fill = backup_gradient.clone().into();

Expand All @@ -1846,23 +1847,28 @@ pub(crate) fn fill_properties(node_id: NodeId, context: &mut NodePropertiesConte
.value(fill.clone().into())
.on_update(move |x: &ColorInput| Message::Batched {
messages: Box::new([
match &fill2 {
Fill::None => NodeGraphMessage::SetInputValue {
// Put the new and most up to date colour into the backup slot (to avoid out of date backup slot)
match &x.value {
FillChoice::None => NodeGraphMessage::SetInputValue {
node_id,
input_index: BackupColorInput::INDEX,
value: TaggedValue::Color(Table::new()),
}
.into(),
Fill::Solid(color) => NodeGraphMessage::SetInputValue {
FillChoice::Solid(color) => NodeGraphMessage::SetInputValue {
node_id,
input_index: BackupColorInput::INDEX,
value: TaggedValue::Color(Table::new_from_element(*color)),
}
.into(),
Fill::Gradient(gradient) => NodeGraphMessage::SetInputValue {
FillChoice::Gradient(gradient) => NodeGraphMessage::SetInputValue {
node_id,
input_index: BackupGradientInput::INDEX,
value: TaggedValue::Gradient(gradient.clone()),
value: {
let mut backup_gradient_new = fill2.as_gradient().cloned().unwrap_or_else(|| backup_gradient2.clone());
backup_gradient_new.stops = gradient.clone();
TaggedValue::Gradient(backup_gradient_new)
},
}
.into(),
},
Expand Down