leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(color-picker): optional initial color and fallback color

Browse source
This commit is contained in:
Ashley Wulber 2023-10-05 11:07:50 -04:00
parent b1b32b867c
commit e154c2ef42
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/widget/color_picker/mod.rs
View file

@ -72,9 +72,11 @@ pub struct ColorPickerModel {
#[setters(skip)] #[setters(skip)]
input_color: String, input_color: String,
#[setters(skip)] #[setters(skip)]
applied_color: Color, applied_color: Option<Color>,
#[setters(skip)] #[setters(skip)]
initial_color: Color, initial_color: Option<Color>,
#[setters(skip)]
fallback_color: Option<Color>,
#[setters(skip)] #[setters(skip)]
recent_colors: Vec<Color>, recent_colors: Vec<Color>,
active: bool, active: bool,
@ -91,11 +93,11 @@ impl ColorPickerModel {
pub fn new( pub fn new(
hex: impl Into<Cow<'static, str>> + Clone, hex: impl Into<Cow<'static, str>> + Clone,
rgb: impl Into<Cow<'static, str>> + Clone, rgb: impl Into<Cow<'static, str>> + Clone,
fallback_color: Color, fallback_color: Option<Color>,
initial_color: Option<Color>, initial_color: Option<Color>,
) -> Self { ) -> Self {
let initial = initial_color.unwrap_or(fallback_color); let initial = initial_color.or(fallback_color);
let initial_srgb = palette::Srgb::from(initial); let initial_srgb = palette::Srgb::from(initial.unwrap_or(Color::BLACK));
let hsv = palette::Hsv::from_color(initial_srgb); let hsv = palette::Hsv::from_color(initial_srgb);
Self { Self {
segmented_model: segmented_button::Model::builder() segmented_model: segmented_button::Model::builder()
@ -103,10 +105,11 @@ impl ColorPickerModel {
.insert(move |b| b.text(rgb.clone())) .insert(move |b| b.text(rgb.clone()))
.build(), .build(),
active_color: hsv, active_color: hsv,
save_next: Some(initial), save_next: None,
input_color: color_to_string(hsv, true), input_color: color_to_string(hsv, true),
applied_color: fallback_color, applied_color: initial,
initial_color: initial, initial_color,
fallback_color,
recent_colors: Vec::new(), // TODO should all color pickers show the same recent colors? recent_colors: Vec::new(), // TODO should all color pickers show the same recent colors?
active: false, active: false,
width: Length::Fixed(300.0), width: Length::Fixed(300.0),
@ -124,7 +127,7 @@ impl ColorPickerModel {
) -> crate::widget::Button<'a, Message, crate::Renderer> { ) -> crate::widget::Button<'a, Message, crate::Renderer> {
color_button( color_button(
Some(f(ColorPickerUpdate::ToggleColorPicker)), Some(f(ColorPickerUpdate::ToggleColorPicker)),
self.applied_color, self.applied_color.unwrap_or(Color::BLACK),
) )
} }
@ -142,8 +145,10 @@ impl ColorPickerModel {
} }
ColorPickerUpdate::AppliedColor => { ColorPickerUpdate::AppliedColor => {
let srgb = palette::Srgb::from_color(self.active_color); let srgb = palette::Srgb::from_color(self.active_color);
self.recent_colors.push(self.applied_color); if let Some(applied_color) = self.applied_color.take() {
self.applied_color = Color::from(srgb); self.recent_colors.push(applied_color);
}
self.applied_color = Some(Color::from(srgb));
self.active = false; self.active = false;
} }
ColorPickerUpdate::ActivateSegmented(e) => { ColorPickerUpdate::ActivateSegmented(e) => {
@ -167,10 +172,10 @@ impl ColorPickerModel {
ColorPickerUpdate::Reset => { ColorPickerUpdate::Reset => {
self.must_clear_cache.store(true, Ordering::SeqCst); self.must_clear_cache.store(true, Ordering::SeqCst);
let initial_srgb = palette::Srgb::from(self.initial_color); let initial_srgb = palette::Srgb::from(self.fallback_color.unwrap_or(Color::BLACK));
let hsv = palette::Hsv::from_color(initial_srgb); let hsv = palette::Hsv::from_color(initial_srgb);
self.active_color = hsv; self.active_color = hsv;
self.applied_color = self.initial_color; self.applied_color = self.fallback_color;
self.copied_at = None; self.copied_at = None;
} }
ColorPickerUpdate::Cancel => { ColorPickerUpdate::Cancel => {
@ -216,7 +221,7 @@ impl ColorPickerModel {
/// Get the applied color of the picker /// Get the applied color of the picker
#[must_use] #[must_use]
pub fn get_applied_color(&self) -> Color { pub fn get_applied_color(&self) -> Option<Color> {
self.applied_color self.applied_color
} }