From bfc84c475909dca0b1d54b3375f1514a72ffc1c0 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Mon, 26 Feb 2024 16:20:24 +0100
Subject: [PATCH] refactor!(widget): rename `segmented_selection` to
 `segmented_control` to match Figma docs

---
 src/theme/style/segmented_button.rs                         | 6 +++---
 src/widget/color_picker/mod.rs                              | 4 ++--
 src/widget/mod.rs                                           | 2 +-
 src/widget/segmented_button/horizontal.rs                   | 2 +-
 src/widget/segmented_button/widget.rs                       | 4 ++--
 src/widget/{segmented_selection.rs => segmented_control.rs} | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename src/widget/{segmented_selection.rs => segmented_control.rs} (94%)

diff --git a/src/theme/style/segmented_button.rs b/src/theme/style/segmented_button.rs
index 8496afdb..bb0afa1b 100644
--- a/src/theme/style/segmented_button.rs
+++ b/src/theme/style/segmented_button.rs
@@ -13,7 +13,7 @@ pub enum SegmentedButton {
     #[default]
     ViewSwitcher,
     /// A widget for multiple choice selection.
-    Selection,
+    Control,
     /// Or implement any custom theme of your liking.
     Custom(Box<dyn Fn(&Theme) -> Appearance>),
 }
@@ -54,7 +54,7 @@ impl StyleSheet for Theme {
                     ..Default::default()
                 }
             }
-            SegmentedButton::Selection => {
+            SegmentedButton::Control => {
                 let cosmic = self.cosmic();
                 let active = horizontal::selection_active(cosmic);
                 let mut neutral_5 = cosmic.palette.neutral_5;
@@ -110,7 +110,7 @@ impl StyleSheet for Theme {
                     ..Default::default()
                 }
             }
-            SegmentedButton::Selection => {
+            SegmentedButton::Control => {
                 let active = vertical::selection_active(cosmic);
                 let mut neutral_5 = cosmic.palette.neutral_5;
                 neutral_5.alpha = 0.2;
diff --git a/src/widget/color_picker/mod.rs b/src/widget/color_picker/mod.rs
index 2943d484..cabe2cb7 100644
--- a/src/widget/color_picker/mod.rs
+++ b/src/widget/color_picker/mod.rs
@@ -30,7 +30,7 @@ use super::button::StyleSheet;
 use super::divider::horizontal;
 use super::icon::{self, from_name};
 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?
 lazy_static! {
@@ -281,7 +281,7 @@ where
         let spacing = THEME.with(|t| t.borrow().cosmic().spacing);
         let mut inner = column![
             // segmented buttons
-            segmented_selection::horizontal(self.model)
+            segmented_control::horizontal(self.model)
                 .on_activate(Box::new(move |e| on_update(
                     ColorPickerUpdate::ActivateSegmented(e)
                 )))
diff --git a/src/widget/mod.rs b/src/widget/mod.rs
index 97b1f50d..ca8e3360 100644
--- a/src/widget/mod.rs
+++ b/src/widget/mod.rs
@@ -166,7 +166,7 @@ mod scrollable;
 pub use scrollable::*;
 
 pub mod segmented_button;
-pub mod segmented_selection;
+pub mod segmented_control;
 
 pub mod settings;
 
diff --git a/src/widget/segmented_button/horizontal.rs b/src/widget/segmented_button/horizontal.rs
index 9fd74ae2..ac662b7a 100644
--- a/src/widget/segmented_button/horizontal.rs
+++ b/src/widget/segmented_button/horizontal.rs
@@ -65,7 +65,7 @@ where
                 / 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(
             self.model
diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs
index 4e411405..04b6bbd4 100644
--- a/src/widget/segmented_button/widget.rs
+++ b/src/widget/segmented_button/widget.rs
@@ -356,7 +356,7 @@ where
             width += f32::from(icon.size) + f32::from(self.button_spacing);
         } else if self.model.is_active(button) {
             // 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);
             }
         }
@@ -1061,7 +1061,7 @@ where
             } else {
                 // Draw the selection indicator if widget is a segmented selection, and the item is selected.
                 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;
                         image_bounds.y = center_y - 16.0 / 2.0;
 
diff --git a/src/widget/segmented_selection.rs b/src/widget/segmented_control.rs
similarity index 94%
rename from src/widget/segmented_selection.rs
rename to src/widget/segmented_control.rs
index d2e05f9d..7ba7a40b 100644
--- a/src/widget/segmented_selection.rs
+++ b/src/widget/segmented_control.rs
@@ -30,7 +30,7 @@ where
         .button_height(32)
         .button_padding([space_s, 0, space_s, 0])
         .button_spacing(space_xxs)
-        .style(crate::theme::SegmentedButton::Selection)
+        .style(crate::theme::SegmentedButton::Control)
         .font_active(Some(crate::font::FONT_SEMIBOLD))
 }
 
@@ -56,6 +56,6 @@ where
         .button_height(32)
         .button_padding([space_s, 0, space_s, 0])
         .button_spacing(space_xxs)
-        .style(crate::theme::SegmentedButton::Selection)
+        .style(crate::theme::SegmentedButton::Control)
         .font_active(Some(crate::font::FONT_SEMIBOLD))
 }