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

refactor!: separate horizontal and vertical segmented button widgets

Browse source 
- Removes the orientation enum in favor of two separate widgets
- Implements the spacing attribute for both widgets
- Demo is updated to display spaced variants of the widgets
This commit is contained in:
Michael Aaron Murphy 2023-01-03 19:35:34 +01:00 • committed by Michael Murphy
parent 3af1da6332
commit 444e389496
12 changed files with 969 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,10 +7,7 @@ use cosmic::{
iced_native::window,
iced_winit::window::{close, drag, minimize, toggle_maximize},
theme::{self, Theme},
widget::{
header_bar, icon, list, nav_bar, nav_button, scrollable, segmented_button, settings,
spin_button::{SpinButtonModel, SpinMessage},
},
widget::{header_bar, icon, list, nav_bar, nav_button, scrollable, settings},
Element, ElementExt,
};
use std::{

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

@ -2,10 +2,11 @@ use cosmic::{
iced::widget::{checkbox, pick_list, progress_bar, radio, row, slider},
iced::{Alignment, Length},
theme::{Button as ButtonTheme, Theme},
widget::{button, segmented_button::{self, cosmic::{view_switcher, segmented_selection}}, settings, toggler, Orientation, spin_button::{SpinButtonModel, SpinMessage}},
widget::{button, settings, toggler, spin_button::{SpinButtonModel, SpinMessage}},
Element,
};
use cosmic::widget::segmented_button::{self, cosmic::{horizontal_segmented_selection, horizontal_view_switcher, vertical_segmented_selection, vertical_view_switcher}};
use super::{Page, Window};
pub enum DemoView {
@ -79,7 +80,7 @@ impl State {
settings::view_column(vec![
window.page_title(Page::Demo),
view_switcher(&self.view_switcher)
horizontal_view_switcher(&self.view_switcher)
.on_activate(Message::ViewSwitcher)
.into(),
match self.view_switcher.active_data() {
@ -170,50 +171,71 @@ impl State {
cosmic::iced::widget::text("Selection")
.font(cosmic::font::FONT_SEMIBOLD)
.into(),
segmented_selection(&self.selection)
cosmic::iced::widget::text("Horizontal").into(),
horizontal_segmented_selection(&self.selection)
.on_activate(Message::Selection)
.into(),
segmented_selection(&self.selection)
cosmic::iced::widget::text("Horizontal With Spacing").into(),
horizontal_segmented_selection(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.orientation(Orientation::Vertical)
.into(),
cosmic::iced::widget::text("Vertical").into(),
vertical_segmented_selection(&self.selection)
.on_activate(Message::Selection)
.into(),
cosmic::iced::widget::text("Vertical With Spacing").into(),
cosmic::iced::widget::row(vec![
segmented_selection(&self.selection)
vertical_segmented_selection(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.orientation(Orientation::Vertical)
.width(Length::FillPortion(1))
.into(),
segmented_selection(&self.selection)
vertical_segmented_selection(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.orientation(Orientation::Vertical)
.width(Length::FillPortion(1))
.into(),
segmented_selection(&self.selection)
vertical_segmented_selection(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.orientation(Orientation::Vertical)
.width(Length::FillPortion(1))
.into(),
])
.spacing(12)
.width(Length::Fill)
.into(),
cosmic::iced::widget::text("ViewSwitcher")
cosmic::iced::widget::text("View Switcher")
.font(cosmic::font::FONT_SEMIBOLD)
.into(),
cosmic::iced::widget::text("Horizontal").into(),
horizontal_view_switcher(&self.selection)
.on_activate(Message::Selection)
.into(),
cosmic::iced::widget::text("Horizontal With Spacing").into(),
horizontal_view_switcher(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.into(),
cosmic::iced::widget::text("Vertical").into(),
vertical_view_switcher(&self.selection)
.on_activate(Message::Selection)
.into(),
cosmic::iced::widget::text("Vertical With Spacing").into(),
cosmic::iced::widget::row(vec![
view_switcher(&self.selection)
vertical_view_switcher(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.orientation(Orientation::Vertical)
.width(Length::FillPortion(1))
.into(),
view_switcher(&self.selection)
vertical_view_switcher(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.orientation(Orientation::Vertical)
.width(Length::FillPortion(1))
.into(),
view_switcher(&self.selection)
vertical_view_switcher(&self.selection)
.spacing(8)
.on_activate(Message::Selection)
.orientation(Orientation::Vertical)
.width(Length::FillPortion(1))
.into(),
])