diff --git a/examples/cosmic/src/window.rs b/examples/cosmic/src/window.rs index 25d286c..c02a014 100644 --- a/examples/cosmic/src/window.rs +++ b/examples/cosmic/src/window.rs @@ -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, Selectable, SingleSelect}, + segmented_button::{self, cosmic::vertical_view_switcher, SingleSelect}, settings, }, Element, ElementExt, diff --git a/examples/cosmic/src/window/demo.rs b/examples/cosmic/src/window/demo.rs index 4ada6ce..267d64c 100644 --- a/examples/cosmic/src/window/demo.rs +++ b/examples/cosmic/src/window/demo.rs @@ -1,10 +1,11 @@ +use apply::Apply; use cosmic::{ iced::widget::{checkbox, pick_list, progress_bar, radio, row, slider}, - iced::{Alignment, Length}, + iced::{widget::container, Alignment, Length}, theme::{Button as ButtonTheme, Theme}, widget::{ button, - segmented_button::{MultiSelect, Selectable, SingleSelect}, + segmented_button::{MultiSelect, SingleSelect}, settings, spin_button::{SpinButtonModel, SpinMessage}, toggler, @@ -246,10 +247,23 @@ impl State { .spacing(8) .on_activate(Message::Selection) .into(), - cosmic::iced::widget::text("Vertical (Multi-Select)").into(), - vertical_segmented_selection(&self.multi_selection) + cosmic::iced::widget::text("Horizontal Multi-Select").into(), + horizontal_segmented_selection(&self.multi_selection) + .spacing(8) .on_activate(Message::MultiSelection) .into(), + cosmic::iced::widget::text("Vertical").into(), + vertical_segmented_selection(&self.selection) + .on_activate(Message::Selection) + .into(), + cosmic::iced::widget::text("Vertical Multi-Select Shrunk").into(), + vertical_segmented_selection(&self.multi_selection) + .width(Length::Shrink) + .on_activate(Message::MultiSelection) + .apply(container) + .center_x() + .width(Length::Fill) + .into(), cosmic::iced::widget::text("Vertical With Spacing").into(), cosmic::iced::widget::row(vec![ vertical_segmented_selection(&self.selection) @@ -278,6 +292,10 @@ impl State { horizontal_view_switcher(&self.selection) .on_activate(Message::Selection) .into(), + cosmic::iced::widget::text("Horizontal Multi-Select").into(), + horizontal_view_switcher(&self.multi_selection) + .on_activate(Message::MultiSelection) + .into(), cosmic::iced::widget::text("Horizontal With Spacing").into(), horizontal_view_switcher(&self.selection) .spacing(8) @@ -287,6 +305,10 @@ impl State { vertical_view_switcher(&self.selection) .on_activate(Message::Selection) .into(), + cosmic::iced::widget::text("Vertical Multi-Select").into(), + vertical_view_switcher(&self.multi_selection) + .on_activate(Message::MultiSelection) + .into(), cosmic::iced::widget::text("Vertical With Spacing").into(), cosmic::iced::widget::row(vec![ vertical_view_switcher(&self.selection)