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

refactor(container): make layer optional and export as container

Browse source
This commit is contained in:
Ashley Wulber 2023-02-28 11:17:37 -05:00 • committed by Jeremy Soller
parent 8d968f931d
commit b35af255b4
2 changed files with 58 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,11 @@ use apply::Apply;
use cosmic::{ use cosmic::{
cosmic_theme, cosmic_theme,
iced::widget::{checkbox, pick_list, progress_bar, radio, row, slider, text}, iced::widget::{checkbox, pick_list, progress_bar, radio, row, slider, text},
iced::{widget::container, Alignment, Length}, iced::{Alignment, Length},
theme::{self, Button as ButtonTheme, Theme}, theme::{self, Button as ButtonTheme, Theme},
widget::{ widget::{
button, cosmic_container, icon, segmented_button, segmented_selection, settings, button, container, icon, segmented_button, segmented_selection, settings, spin_button,
spin_button, toggler, view_switcher, toggler, view_switcher,
}, },
Element, Element,
}; };
@ -375,27 +375,21 @@ impl State {
.into() .into()
} }
}, },
cosmic_container( container(text("Background container with some text").size(24))
text("Background container with some text").size(24), .layer(cosmic_theme::Layer::Background)
cosmic_theme::Layer::Background, .padding(8)
) .width(Length::Fill)
.padding(8) .into(),
.width(Length::Fill) container(text("Primary container with some text").size(24))
.into(), .layer(cosmic_theme::Layer::Primary)
cosmic_container( .padding(8)
text("Primary container with some text").size(24), .width(Length::Fill)
cosmic_theme::Layer::Primary, .into(),
) container(text("Secondary container with some text").size(24))
.padding(8) .layer(cosmic_theme::Layer::Secondary)
.width(Length::Fill) .padding(8)
.into(), .width(Length::Fill)
cosmic_container( .into(),
text("Secondary container with some text").size(24),
cosmic_theme::Layer::Secondary,
)
.padding(8)
.width(Length::Fill)
.into(),
]) ])
.into() .into()
} }

68
src/widget/cosmic_container.rs
View file

@ -10,50 +10,57 @@ use iced_native::widget::{Operation, Tree};
use iced_native::{Clipboard, Element, Layout, Length, Padding, Point, Rectangle, Shell, Widget}; use iced_native::{Clipboard, Element, Layout, Length, Padding, Point, Rectangle, Shell, Widget};
pub use iced_style::container::{Appearance, StyleSheet}; pub use iced_style::container::{Appearance, StyleSheet};
pub fn cosmic_container<'a, Message: 'static, T>( pub fn container<'a, Message: 'static, T>(
content: T, content: T,
layer: cosmic_theme::Layer, ) -> LayerContainer<'a, Message, crate::Renderer>
) -> CosmicContainer<'a, Message, crate::Renderer>
where where
T: Into<Element<'a, Message, crate::Renderer>>, T: Into<Element<'a, Message, crate::Renderer>>,
{ {
CosmicContainer::new(content, layer).style(match layer { LayerContainer::new(content)
cosmic_theme::Layer::Background => crate::theme::Container::Background,
cosmic_theme::Layer::Primary => crate::theme::Container::Primary,
cosmic_theme::Layer::Secondary => crate::theme::Container::Secondary,
})
} }
/// An element decorating some content. /// An element decorating some content.
/// ///
/// It is normally used for alignment purposes. /// It is normally used for alignment purposes.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct CosmicContainer<'a, Message, Renderer> pub struct LayerContainer<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme, Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme,
{ {
layer: cosmic_theme::Layer, layer: Option<cosmic_theme::Layer>,
container: Container<'a, Message, Renderer>, container: Container<'a, Message, Renderer>,
} }
impl<'a, Message, Renderer> CosmicContainer<'a, Message, Renderer> impl<'a, Message, Renderer> LayerContainer<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme, Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme,
<Renderer::Theme as StyleSheet>::Style: std::convert::From<crate::theme::Container>,
{ {
/// Creates an empty [`Container`]. /// Creates an empty [`Container`].
pub(crate) fn new<T>(content: T, layer: cosmic_theme::Layer) -> Self pub(crate) fn new<T>(content: T) -> Self
where where
T: Into<Element<'a, Message, Renderer>>, T: Into<Element<'a, Message, Renderer>>,
{ {
CosmicContainer { LayerContainer {
layer, layer: None,
container: Container::new(content), container: Container::new(content),
} }
} }
/// Sets the [`Padding`] of the [`Container`]. /// Sets the [`Layer`] of the [`LayerContainer`].
#[must_use]
pub fn layer(mut self, layer: cosmic_theme::Layer) -> Self {
self.layer = Some(layer);
self.style(match layer {
cosmic_theme::Layer::Background => crate::theme::Container::Background,
cosmic_theme::Layer::Primary => crate::theme::Container::Primary,
cosmic_theme::Layer::Secondary => crate::theme::Container::Secondary,
})
}
/// Sets the [`Padding`] of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self { pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self {
self.container = self.container.padding(padding); self.container = self.container.padding(padding);
@ -67,56 +74,56 @@ where
self self
} }
/// Sets the height of the [`Container`]. /// Sets the height of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn height(mut self, height: Length) -> Self { pub fn height(mut self, height: Length) -> Self {
self.container = self.container.height(height); self.container = self.container.height(height);
self self
} }
/// Sets the maximum width of the [`Container`]. /// Sets the maximum width of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn max_width(mut self, max_width: u32) -> Self { pub fn max_width(mut self, max_width: u32) -> Self {
self.container = self.container.max_width(max_width); self.container = self.container.max_width(max_width);
self self
} }
/// Sets the maximum height of the [`Container`] in pixels. /// Sets the maximum height of the [`LayerContainer`] in pixels.
#[must_use] #[must_use]
pub fn max_height(mut self, max_height: u32) -> Self { pub fn max_height(mut self, max_height: u32) -> Self {
self.container = self.container.max_height(max_height); self.container = self.container.max_height(max_height);
self self
} }
/// Sets the content alignment for the horizontal axis of the [`Container`]. /// Sets the content alignment for the horizontal axis of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn align_x(mut self, alignment: alignment::Horizontal) -> Self { pub fn align_x(mut self, alignment: alignment::Horizontal) -> Self {
self.container = self.container.align_x(alignment); self.container = self.container.align_x(alignment);
self self
} }
/// Sets the content alignment for the vertical axis of the [`Container`]. /// Sets the content alignment for the vertical axis of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn align_y(mut self, alignment: alignment::Vertical) -> Self { pub fn align_y(mut self, alignment: alignment::Vertical) -> Self {
self.container = self.container.align_y(alignment); self.container = self.container.align_y(alignment);
self self
} }
/// Centers the contents in the horizontal axis of the [`Container`]. /// Centers the contents in the horizontal axis of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn center_x(mut self) -> Self { pub fn center_x(mut self) -> Self {
self.container = self.container.center_x(); self.container = self.container.center_x();
self self
} }
/// Centers the contents in the vertical axis of the [`Container`]. /// Centers the contents in the vertical axis of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn center_y(mut self) -> Self { pub fn center_y(mut self) -> Self {
self.container = self.container.center_y(); self.container = self.container.center_y();
self self
} }
/// Sets the style of the [`Container`]. /// Sets the style of the [`LayerContainer`].
#[must_use] #[must_use]
pub fn style(mut self, style: impl Into<<Renderer::Theme as StyleSheet>::Style>) -> Self { pub fn style(mut self, style: impl Into<<Renderer::Theme as StyleSheet>::Style>) -> Self {
self.container = self.container.style(style); self.container = self.container.style(style);
@ -124,7 +131,7 @@ where
} }
} }
impl<'a, Message, Renderer> Widget<Message, Renderer> for CosmicContainer<'a, Message, Renderer> impl<'a, Message, Renderer> Widget<Message, Renderer> for LayerContainer<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme, Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme,
@ -196,8 +203,13 @@ where
cursor_position: Point, cursor_position: Point,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
let mut theme = theme.clone(); let theme = if let Some(layer) = self.layer {
theme.set_layer(self.layer); let mut theme = theme.clone();
theme.set_layer(layer);
theme
} else {
theme.clone()
};
self.container.draw( self.container.draw(
tree, tree,
renderer, renderer,
@ -219,14 +231,14 @@ where
} }
} }
impl<'a, Message, Renderer> From<CosmicContainer<'a, Message, Renderer>> impl<'a, Message, Renderer> From<LayerContainer<'a, Message, Renderer>>
for Element<'a, Message, Renderer> for Element<'a, Message, Renderer>
where where
Message: 'a, Message: 'a,
Renderer: 'a + iced_native::Renderer, Renderer: 'a + iced_native::Renderer,
Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme, Renderer::Theme: StyleSheet + Clone + cosmic_theme::LayeredTheme,
{ {
fn from(column: CosmicContainer<'a, Message, Renderer>) -> Element<'a, Message, Renderer> { fn from(column: LayerContainer<'a, Message, Renderer>) -> Element<'a, Message, Renderer> {
Element::new(column) Element::new(column)
} }
} }