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

refactor!(widget): rename segmented_selection to segmented_control to match Figma docs

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-02-26 16:20:24 +01:00 • committed by Michael Murphy
parent 366a450977
commit bfc84c4759
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/theme/style/segmented_button.rs
View file

@ -13,7 +13,7 @@ pub enum SegmentedButton {
#[default] #[default]
ViewSwitcher, ViewSwitcher,
/// A widget for multiple choice selection. /// A widget for multiple choice selection.
Selection, Control,
/// Or implement any custom theme of your liking. /// Or implement any custom theme of your liking.
Custom(Box<dyn Fn(&Theme) -> Appearance>), Custom(Box<dyn Fn(&Theme) -> Appearance>),
} }
@ -54,7 +54,7 @@ impl StyleSheet for Theme {
..Default::default() ..Default::default()
} }
} }
SegmentedButton::Selection => { SegmentedButton::Control => {
let cosmic = self.cosmic(); let cosmic = self.cosmic();
let active = horizontal::selection_active(cosmic); let active = horizontal::selection_active(cosmic);
let mut neutral_5 = cosmic.palette.neutral_5; let mut neutral_5 = cosmic.palette.neutral_5;
@ -110,7 +110,7 @@ impl StyleSheet for Theme {
..Default::default() ..Default::default()
} }
} }
SegmentedButton::Selection => { SegmentedButton::Control => {
let active = vertical::selection_active(cosmic); let active = vertical::selection_active(cosmic);
let mut neutral_5 = cosmic.palette.neutral_5; let mut neutral_5 = cosmic.palette.neutral_5;
neutral_5.alpha = 0.2; neutral_5.alpha = 0.2;

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

@ -30,7 +30,7 @@ use super::button::StyleSheet;
use super::divider::horizontal; use super::divider::horizontal;
use super::icon::{self, from_name}; use super::icon::{self, from_name};
use super::segmented_button::{self, Model, SingleSelect}; use super::segmented_button::{self, Model, SingleSelect};
use super::{button, segmented_selection, text, text_input, tooltip, Icon}; use super::{button, segmented_control, text, text_input, tooltip, Icon};
// TODO is this going to look correct enough? // TODO is this going to look correct enough?
lazy_static! { lazy_static! {
@ -281,7 +281,7 @@ where
let spacing = THEME.with(|t| t.borrow().cosmic().spacing); let spacing = THEME.with(|t| t.borrow().cosmic().spacing);
let mut inner = column![ let mut inner = column![
// segmented buttons // segmented buttons
segmented_selection::horizontal(self.model) segmented_control::horizontal(self.model)
.on_activate(Box::new(move |e| on_update( .on_activate(Box::new(move |e| on_update(
ColorPickerUpdate::ActivateSegmented(e) ColorPickerUpdate::ActivateSegmented(e)
))) )))

2
src/widget/mod.rs
View file

@ -166,7 +166,7 @@ mod scrollable;
pub use scrollable::*; pub use scrollable::*;
pub mod segmented_button; pub mod segmented_button;
pub mod segmented_selection; pub mod segmented_control;
pub mod settings; pub mod settings;

2
src/widget/segmented_button/horizontal.rs
View file

@ -65,7 +65,7 @@ where
/ num as f32; / num as f32;
} }
let segmented_selection = matches!(self.style, crate::theme::SegmentedButton::Selection); let segmented_selection = matches!(self.style, crate::theme::SegmentedButton::Control);
Box::new( Box::new(
self.model self.model

4
src/widget/segmented_button/widget.rs
View file

@ -356,7 +356,7 @@ where
width += f32::from(icon.size) + f32::from(self.button_spacing); width += f32::from(icon.size) + f32::from(self.button_spacing);
} else if self.model.is_active(button) { } else if self.model.is_active(button) {
// Add selection icon measurements when widget is a selection widget. // Add selection icon measurements when widget is a selection widget.
if let crate::theme::SegmentedButton::Selection = self.style { if let crate::theme::SegmentedButton::Control = self.style {
width += 16.0 + f32::from(self.button_spacing); width += 16.0 + f32::from(self.button_spacing);
} }
} }
@ -1061,7 +1061,7 @@ where
} else { } else {
// Draw the selection indicator if widget is a segmented selection, and the item is selected. // Draw the selection indicator if widget is a segmented selection, and the item is selected.
if key_is_active { if key_is_active {
if let crate::theme::SegmentedButton::Selection = self.style { if let crate::theme::SegmentedButton::Control = self.style {
let mut image_bounds = bounds; let mut image_bounds = bounds;
image_bounds.y = center_y - 16.0 / 2.0; image_bounds.y = center_y - 16.0 / 2.0;

4
src/widget/segmented_selection.rs → src/widget/segmented_control.rs
View file

@ -30,7 +30,7 @@ where
.button_height(32) .button_height(32)
.button_padding([space_s, 0, space_s, 0]) .button_padding([space_s, 0, space_s, 0])
.button_spacing(space_xxs) .button_spacing(space_xxs)
.style(crate::theme::SegmentedButton::Selection) .style(crate::theme::SegmentedButton::Control)
.font_active(Some(crate::font::FONT_SEMIBOLD)) .font_active(Some(crate::font::FONT_SEMIBOLD))
} }
@ -56,6 +56,6 @@ where
.button_height(32) .button_height(32)
.button_padding([space_s, 0, space_s, 0]) .button_padding([space_s, 0, space_s, 0])
.button_spacing(space_xxs) .button_spacing(space_xxs)
.style(crate::theme::SegmentedButton::Selection) .style(crate::theme::SegmentedButton::Control)
.font_active(Some(crate::font::FONT_SEMIBOLD)) .font_active(Some(crate::font::FONT_SEMIBOLD))
} }