Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Color Picker: the remembered colours seeded with map entries

moppeeer8fec15f3dcf4
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 608c4fcb6..2f0f0049d 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -7225,16 +7225,12 @@ fn color_picker(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
use picker_layout as at;
let lang = app.ui.language.clone();
let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
- if !d.fields.contains_key("old") {
- let old = d.s("hex");
- d.fields.insert("old".into(), json!(old));
- }
+ let old = d.s("hex");
+ d.fields.entry("old").or_insert_with(|| json!(old));
let comp = PickComp::from_key(&d.s("component"));
let mut p = picked_of(d);
let before = p;
- if !d.fields.contains_key("rgb") {
- d.fields.insert("rgb".into(), json!(p.rgb.map(|x| x * 255.0)));
- }
+ d.fields.entry("rgb").or_insert_with(|| json!(p.rgb.map(|x| x * 255.0)));
if !d.fields.contains_key("cmyk") {
d.fields.insert(
"cmyk".into(),