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

feat: MultiSelect support for segmented buttons

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-01-06 16:18:25 +01:00 • committed by Michael Murphy
parent b1cbcfaf5b
commit 8988b25b6a
9 changed files with 263 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/cosmic/src/window.rs
View file

@ -13,7 +13,7 @@ use cosmic::{
theme::{self, Theme},
widget::{
header_bar, icon, list, nav_bar, nav_button, scrollable,
segmented_button::{self, cosmic::vertical_view_switcher},
segmented_button::{self, cosmic::vertical_view_switcher, Selectable, SingleSelect},
settings,
},
Element, ElementExt,
@ -136,7 +136,7 @@ pub struct Window {
debug: bool,
demo: demo::State,
desktop: desktop::State,
nav_bar_pages: segmented_button::State<Page>,
nav_bar_pages: segmented_button::State<SingleSelect, Page>,
nav_bar_toggled_condensed: bool,
nav_bar_toggled: bool,
page: Page,

34
examples/cosmic/src/window/demo.rs
View file

@ -3,7 +3,9 @@ use cosmic::{
iced::{Alignment, Length},
theme::{Button as ButtonTheme, Theme},
widget::{
button, settings,
button,
segmented_button::{MultiSelect, Selectable, SingleSelect},
settings,
spin_button::{SpinButtonModel, SpinMessage},
toggler,
},
@ -25,12 +27,21 @@ pub enum DemoView {
TabC,
}
pub enum MultiOption {
OptionA,
OptionB,
OptionC,
OptionD,
OptionE,
}
#[derive(Clone, Copy, Debug)]
pub enum Message {
ButtonPressed,
CheckboxToggled(bool),
Debug(bool),
IconTheme(segmented_button::Key),
MultiSelection(segmented_button::Key),
PickListSelected(&'static str),
RowSelected(usize),
Selection(segmented_button::Key),
@ -48,13 +59,14 @@ pub enum Output {
pub struct State {
pub checkbox_value: bool,
pub icon_theme: segmented_button::State<&'static str>,
pub icon_theme: segmented_button::State<SingleSelect, &'static str>,
pub multi_selection: segmented_button::State<MultiSelect, MultiOption>,
pub pick_list_selected: Option<&'static str>,
pub selection: segmented_button::State<()>,
pub selection: segmented_button::State<SingleSelect, ()>,
pub slider_value: f32,
pub spin_button: SpinButtonModel<i32>,
pub toggler_value: bool,
pub view_switcher: segmented_button::State<DemoView>,
pub view_switcher: segmented_button::State<SingleSelect, DemoView>,
}
impl Default for State {
@ -74,6 +86,13 @@ impl Default for State {
.insert("Choice B", ())
.insert("Choice C", ())
.build(),
multi_selection: segmented_button::State::builder()
.insert("Option A", MultiOption::OptionA)
.insert("Option B", MultiOption::OptionB)
.insert("Option C", MultiOption::OptionC)
.insert("Option D", MultiOption::OptionD)
.insert("Option E", MultiOption::OptionE)
.build(),
view_switcher: segmented_button::State::builder()
.insert_active("Controls", DemoView::TabA)
.insert("Segmented Button", DemoView::TabB)
@ -91,6 +110,7 @@ impl State {
Message::Debug(value) => return Some(Output::Debug(value)),
Message::PickListSelected(value) => self.pick_list_selected = Some(value),
Message::RowSelected(row) => println!("Selected row {row}"),
Message::MultiSelection(key) => self.multi_selection.activate(key),
Message::Selection(key) => self.selection.activate(key),
Message::SliderChanged(value) => self.slider_value = value,
Message::SpinButton(msg) => self.spin_button.update(msg),
@ -226,9 +246,9 @@ impl State {
.spacing(8)
.on_activate(Message::Selection)
.into(),
cosmic::iced::widget::text("Vertical").into(),
vertical_segmented_selection(&self.selection)
.on_activate(Message::Selection)
cosmic::iced::widget::text("Vertical (Multi-Select)").into(),
vertical_segmented_selection(&self.multi_selection)
.on_activate(Message::MultiSelection)
.into(),
cosmic::iced::widget::text("Vertical With Spacing").into(),
cosmic::iced::widget::row(vec![