me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement theme styling for Container

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-06-07 04:11:24 +02:00
parent 2933ac7355
commit 97555e67af
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
24 changed files with 306 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

80
examples/pane_grid/src/main.rs
View file

@ -193,9 +193,9 @@ impl Application for Example {
.controls(pane.controls.view(id, total_panes, *is_pinned)) .controls(pane.controls.view(id, total_panes, *is_pinned))
.padding(10) .padding(10)
.style(if is_focused { .style(if is_focused {
style::TitleBar::Focused style::title_bar_focused
} else { } else {
style::TitleBar::Active style::title_bar_active
}); });
pane_grid::Content::new(Responsive::new(responsive, move |size| { pane_grid::Content::new(Responsive::new(responsive, move |size| {
@ -203,9 +203,9 @@ impl Application for Example {
})) }))
.title_bar(title_bar) .title_bar(title_bar)
.style(if is_focused { .style(if is_focused {
style::Pane::Focused style::pane_focused
} else { } else {
style::Pane::Active style::pane_active
}) })
}) })
.width(Length::Fill) .width(Length::Fill)
@ -387,51 +387,47 @@ impl Controls {
} }
mod style { mod style {
use iced::{container, Background, Color}; use iced::{container, Theme};
const SURFACE: Color = Color::from_rgb( pub fn title_bar_active(theme: &Theme) -> container::Appearance {
0xF2 as f32 / 255.0, let palette = theme.extended_palette();
0xF3 as f32 / 255.0,
0xF5 as f32 / 255.0,
);
pub enum TitleBar { container::Appearance {
Active, text_color: Some(palette.background.strong.text),
Focused, background: Some(palette.background.strong.color.into()),
} ..Default::default()
impl container::StyleSheet for TitleBar {
fn style(&self) -> container::Style {
let pane = match self {
Self::Active => Pane::Active,
Self::Focused => Pane::Focused,
}
.style();
container::Style {
text_color: Some(Color::WHITE),
background: Some(pane.border_color.into()),
..Default::default()
}
} }
} }
pub enum Pane { pub fn title_bar_focused(theme: &Theme) -> container::Appearance {
Active, let palette = theme.extended_palette();
Focused,
container::Appearance {
text_color: Some(palette.primary.strong.text),
background: Some(palette.primary.strong.color.into()),
..Default::default()
}
} }
impl container::StyleSheet for Pane { pub fn pane_active(theme: &Theme) -> container::Appearance {
fn style(&self) -> container::Style { let palette = theme.extended_palette();
container::Style {
background: Some(Background::Color(SURFACE)), container::Appearance {
border_width: 2.0, background: Some(palette.background.weak.color.into()),
border_color: match self { border_width: 2.0,
Self::Active => Color::from_rgb(0.7, 0.7, 0.7), border_color: palette.background.strong.color,
Self::Focused => Color::BLACK, ..Default::default()
}, }
..Default::default() }
}
pub fn pane_focused(theme: &Theme) -> container::Appearance {
let palette = theme.extended_palette();
container::Appearance {
background: Some(palette.background.weak.color.into()),
border_width: 2.0,
border_color: palette.primary.strong.color,
..Default::default()
} }
} }
} }

1
examples/pure/game_of_life/src/main.rs
View file

@ -151,7 +151,6 @@ impl Application for GameOfLife {
container(content) container(content)
.width(Length::Fill) .width(Length::Fill)
.height(Length::Fill) .height(Length::Fill)
.style(style::Container)
.into() .into()
} }
} }

13
examples/pure/game_of_life/src/style.rs
View file

@ -1,4 +1,4 @@
use iced::{container, pick_list, Color}; use iced::{pick_list, Color};
pub const BACKGROUND: Color = Color::from_rgb( pub const BACKGROUND: Color = Color::from_rgb(
0x2F as f32 / 255.0, 0x2F as f32 / 255.0,
@ -6,17 +6,6 @@ pub const BACKGROUND: Color = Color::from_rgb(
0x36 as f32 / 255.0, 0x36 as f32 / 255.0,
); );
pub struct Container;
impl container::StyleSheet for Container {
fn style(&self) -> container::Style {
container::Style {
text_color: Some(Color::WHITE),
..container::Style::default()
}
}
}
pub struct PickList; pub struct PickList;
impl pick_list::StyleSheet for PickList { impl pick_list::StyleSheet for PickList {

80
examples/pure/pane_grid/src/main.rs
View file

@ -179,9 +179,9 @@ impl Application for Example {
.controls(view_controls(id, total_panes, pane.is_pinned)) .controls(view_controls(id, total_panes, pane.is_pinned))
.padding(10) .padding(10)
.style(if is_focused { .style(if is_focused {
style::TitleBar::Focused style::title_bar_focused
} else { } else {
style::TitleBar::Active style::title_bar_active
}); });
pane_grid::Content::new(responsive(move |size| { pane_grid::Content::new(responsive(move |size| {
@ -189,9 +189,9 @@ impl Application for Example {
})) }))
.title_bar(title_bar) .title_bar(title_bar)
.style(if is_focused { .style(if is_focused {
style::Pane::Focused style::pane_focused
} else { } else {
style::Pane::Active style::pane_active
}) })
}) })
.width(Length::Fill) .width(Length::Fill)
@ -323,51 +323,47 @@ fn view_controls<'a>(
} }
mod style { mod style {
use iced::{container, Background, Color}; use iced::{container, Theme};
const SURFACE: Color = Color::from_rgb( pub fn title_bar_active(theme: &Theme) -> container::Appearance {
0xF2 as f32 / 255.0, let palette = theme.extended_palette();
0xF3 as f32 / 255.0,
0xF5 as f32 / 255.0,
);
pub enum TitleBar { container::Appearance {
Active, text_color: Some(palette.background.strong.text),
Focused, background: Some(palette.background.strong.color.into()),
} ..Default::default()
impl container::StyleSheet for TitleBar {
fn style(&self) -> container::Style {
let pane = match self {
Self::Active => Pane::Active,
Self::Focused => Pane::Focused,
}
.style();
container::Style {
text_color: Some(Color::WHITE),
background: Some(pane.border_color.into()),
..Default::default()
}
} }
} }
pub enum Pane { pub fn title_bar_focused(theme: &Theme) -> container::Appearance {
Active, let palette = theme.extended_palette();
Focused,
container::Appearance {
text_color: Some(palette.primary.strong.text),
background: Some(palette.primary.strong.color.into()),
..Default::default()
}
} }
impl container::StyleSheet for Pane { pub fn pane_active(theme: &Theme) -> container::Appearance {
fn style(&self) -> container::Style { let palette = theme.extended_palette();
container::Style {
background: Some(Background::Color(SURFACE)), container::Appearance {
border_width: 2.0, background: Some(palette.background.weak.color.into()),
border_color: match self { border_width: 2.0,
Self::Active => Color::from_rgb(0.7, 0.7, 0.7), border_color: palette.background.strong.color,
Self::Focused => Color::BLACK, ..Default::default()
}, }
..Default::default() }
}
pub fn pane_focused(theme: &Theme) -> container::Appearance {
let palette = theme.extended_palette();
container::Appearance {
background: Some(palette.background.weak.color.into()),
border_width: 2.0,
border_color: palette.primary.strong.color,
..Default::default()
} }
} }
} }

27
examples/pure/tooltip/src/main.rs
View file

@ -1,6 +1,7 @@
use iced::pure::{ use iced::pure::widget::tooltip::Position;
button, container, tooltip, widget::tooltip::Position, Element, Sandbox, use iced::pure::{button, container, tooltip};
}; use iced::pure::{Element, Sandbox};
use iced::theme;
use iced::{Length, Settings}; use iced::{Length, Settings};
pub fn main() -> iced::Result { pub fn main() -> iced::Result {
@ -53,7 +54,7 @@ impl Sandbox for Example {
self.position, self.position,
) )
.gap(10) .gap(10)
.style(style::Tooltip); .style(theme::Container::Box);
container(tooltip) container(tooltip)
.width(Length::Fill) .width(Length::Fill)
@ -73,21 +74,3 @@ fn position_to_text<'a>(position: Position) -> &'a str {
Position::Right => "Right", Position::Right => "Right",
} }
} }
mod style {
use iced::container;
use iced::Color;
pub struct Tooltip;
impl container::StyleSheet for Tooltip {
fn style(&self) -> container::Style {
container::Style {
text_color: Some(Color::from_rgb8(0xEE, 0xEE, 0xEE)),
background: Some(Color::from_rgb(0.11, 0.42, 0.87).into()),
border_radius: 12.0,
..container::Style::default()
}
}
}
}

26
examples/tooltip/src/main.rs
View file

@ -1,7 +1,9 @@
use iced::alignment::{self, Alignment};
use iced::button;
use iced::theme;
use iced::tooltip::{self, Tooltip}; use iced::tooltip::{self, Tooltip};
use iced::{ use iced::{
alignment, button, Alignment, Button, Column, Container, Element, Length, Button, Column, Container, Element, Length, Row, Sandbox, Settings, Text,
Row, Sandbox, Settings, Text,
}; };
pub fn main() { pub fn main() {
@ -115,24 +117,6 @@ fn tooltip<'a>(
) )
.gap(5) .gap(5)
.padding(10) .padding(10)
.style(style::Tooltip) .style(theme::Container::Box)
.into() .into()
} }
mod style {
use iced::container;
use iced::Color;
pub struct Tooltip;
impl container::StyleSheet for Tooltip {
fn style(&self) -> container::Style {
container::Style {
text_color: Some(Color::from_rgb8(0xEE, 0xEE, 0xEE)),
background: Some(Color::from_rgb(0.11, 0.42, 0.87).into()),
border_radius: 12.0,
..container::Style::default()
}
}
}
}

13
native/src/overlay/menu.rs
View file

@ -7,8 +7,8 @@ use crate::overlay;
use crate::renderer; use crate::renderer;
use crate::text::{self, Text}; use crate::text::{self, Text};
use crate::touch; use crate::touch;
use crate::widget::container::{self, Container};
use crate::widget::scrollable::{self, Scrollable}; use crate::widget::scrollable::{self, Scrollable};
use crate::widget::Container;
use crate::{ use crate::{
Clipboard, Color, Element, Layout, Length, Padding, Point, Rectangle, Clipboard, Color, Element, Layout, Length, Padding, Point, Rectangle,
Shell, Size, Vector, Widget, Shell, Size, Vector, Widget,
@ -34,7 +34,7 @@ impl<'a, T, Renderer> Menu<'a, T, Renderer>
where where
T: ToString + Clone, T: ToString + Clone,
Renderer: text::Renderer + 'a, Renderer: text::Renderer + 'a,
Renderer::Theme: scrollable::StyleSheet, Renderer::Theme: container::StyleSheet + scrollable::StyleSheet,
{ {
/// Creates a new [`Menu`] with the given [`State`], a list of options, and /// Creates a new [`Menu`] with the given [`State`], a list of options, and
/// the message to produced when an option is selected. /// the message to produced when an option is selected.
@ -118,7 +118,11 @@ impl State {
} }
} }
struct Overlay<'a, Message, Renderer> { struct Overlay<'a, Message, Renderer>
where
Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{
container: Container<'a, Message, Renderer>, container: Container<'a, Message, Renderer>,
width: u16, width: u16,
target_height: f32, target_height: f32,
@ -130,7 +134,7 @@ where
Message: 'a, Message: 'a,
Renderer: 'a, Renderer: 'a,
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: scrollable::StyleSheet, Renderer::Theme: container::StyleSheet + scrollable::StyleSheet,
{ {
pub fn new<T>(menu: Menu<'a, T, Renderer>, target_height: f32) -> Self pub fn new<T>(menu: Menu<'a, T, Renderer>, target_height: f32) -> Self
where where
@ -173,6 +177,7 @@ impl<'a, Message, Renderer> crate::Overlay<Message, Renderer>
for Overlay<'a, Message, Renderer> for Overlay<'a, Message, Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn layout( fn layout(
&self, &self,

35
native/src/widget/container.rs
View file

@ -12,13 +12,17 @@ use crate::{
use std::u32; use std::u32;
pub use iced_style::container::{Style, StyleSheet}; pub use iced_style::container::{Appearance, StyleSheet};
/// 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 Container<'a, Message, Renderer> { pub struct Container<'a, Message, Renderer>
where
Renderer: crate::Renderer,
Renderer::Theme: StyleSheet,
{
padding: Padding, padding: Padding,
width: Length, width: Length,
height: Length, height: Length,
@ -26,13 +30,14 @@ pub struct Container<'a, Message, Renderer> {
max_height: u32, max_height: u32,
horizontal_alignment: alignment::Horizontal, horizontal_alignment: alignment::Horizontal,
vertical_alignment: alignment::Vertical, vertical_alignment: alignment::Vertical,
style_sheet: Box<dyn StyleSheet + 'a>, style: <Renderer::Theme as StyleSheet>::Style,
content: Element<'a, Message, Renderer>, content: Element<'a, Message, Renderer>,
} }
impl<'a, Message, Renderer> Container<'a, Message, Renderer> impl<'a, Message, Renderer> Container<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: StyleSheet,
{ {
/// Creates an empty [`Container`]. /// Creates an empty [`Container`].
pub fn new<T>(content: T) -> Self pub fn new<T>(content: T) -> Self
@ -47,7 +52,7 @@ where
max_height: u32::MAX, max_height: u32::MAX,
horizontal_alignment: alignment::Horizontal::Left, horizontal_alignment: alignment::Horizontal::Left,
vertical_alignment: alignment::Vertical::Top, vertical_alignment: alignment::Vertical::Top,
style_sheet: Default::default(), style: Default::default(),
content: content.into(), content: content.into(),
} }
} }
@ -109,9 +114,9 @@ where
/// Sets the style of the [`Container`]. /// Sets the style of the [`Container`].
pub fn style( pub fn style(
mut self, mut self,
style_sheet: impl Into<Box<dyn StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style_sheet.into(); self.style = style.into();
self self
} }
} }
@ -146,6 +151,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
for Container<'a, Message, Renderer> for Container<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: StyleSheet,
{ {
fn width(&self) -> Length { fn width(&self) -> Length {
self.width self.width
@ -215,7 +221,7 @@ where
cursor_position: Point, cursor_position: Point,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
let style = self.style_sheet.style(); let style = theme.appearance(self.style);
draw_background(renderer, &style, layout.bounds()); draw_background(renderer, &style, layout.bounds());
@ -246,20 +252,20 @@ where
/// Draws the background of a [`Container`] given its [`Style`] and its `bounds`. /// Draws the background of a [`Container`] given its [`Style`] and its `bounds`.
pub fn draw_background<Renderer>( pub fn draw_background<Renderer>(
renderer: &mut Renderer, renderer: &mut Renderer,
style: &Style, appearance: &Appearance,
bounds: Rectangle, bounds: Rectangle,
) where ) where
Renderer: crate::Renderer, Renderer: crate::Renderer,
{ {
if style.background.is_some() || style.border_width > 0.0 { if appearance.background.is_some() || appearance.border_width > 0.0 {
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds, bounds,
border_radius: style.border_radius, border_radius: appearance.border_radius,
border_width: style.border_width, border_width: appearance.border_width,
border_color: style.border_color, border_color: appearance.border_color,
}, },
style appearance
.background .background
.unwrap_or(Background::Color(Color::TRANSPARENT)), .unwrap_or(Background::Color(Color::TRANSPARENT)),
); );
@ -269,8 +275,9 @@ pub fn draw_background<Renderer>(
impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>> impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>>
for Element<'a, Message, Renderer> for Element<'a, Message, Renderer>
where where
Renderer: 'a + crate::Renderer,
Message: 'a, Message: 'a,
Renderer: 'a + crate::Renderer,
Renderer::Theme: StyleSheet,
{ {
fn from( fn from(
column: Container<'a, Message, Renderer>, column: Container<'a, Message, Renderer>,

9
native/src/widget/pane_grid.rs
View file

@ -36,6 +36,7 @@ use crate::mouse;
use crate::overlay; use crate::overlay;
use crate::renderer; use crate::renderer;
use crate::touch; use crate::touch;
use crate::widget::container;
use crate::{ use crate::{
Clipboard, Color, Element, Layout, Length, Point, Rectangle, Shell, Size, Clipboard, Color, Element, Layout, Length, Point, Rectangle, Shell, Size,
Vector, Widget, Vector, Widget,
@ -96,7 +97,7 @@ pub use iced_style::pane_grid::{Line, StyleSheet};
pub struct PaneGrid<'a, Message, Renderer> pub struct PaneGrid<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
state: &'a mut state::Internal, state: &'a mut state::Internal,
action: &'a mut state::Action, action: &'a mut state::Action,
@ -113,7 +114,7 @@ where
impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
/// Creates a [`PaneGrid`] with the given [`State`] and view function. /// Creates a [`PaneGrid`] with the given [`State`] and view function.
/// ///
@ -659,7 +660,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
for PaneGrid<'a, Message, Renderer> for PaneGrid<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
fn width(&self) -> Length { fn width(&self) -> Length {
self.width self.width
@ -815,7 +816,7 @@ impl<'a, Message, Renderer> From<PaneGrid<'a, Message, Renderer>>
where where
Message: 'a, Message: 'a,
Renderer: 'a + crate::Renderer, Renderer: 'a + crate::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
fn from( fn from(
pane_grid: PaneGrid<'a, Message, Renderer>, pane_grid: PaneGrid<'a, Message, Renderer>,

22
native/src/widget/pane_grid/content.rs
View file

@ -11,22 +11,27 @@ use crate::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size};
/// ///
/// [`Pane`]: crate::widget::pane_grid::Pane /// [`Pane`]: crate::widget::pane_grid::Pane
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Content<'a, Message, Renderer> { pub struct Content<'a, Message, Renderer>
where
Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{
title_bar: Option<TitleBar<'a, Message, Renderer>>, title_bar: Option<TitleBar<'a, Message, Renderer>>,
body: Element<'a, Message, Renderer>, body: Element<'a, Message, Renderer>,
style_sheet: Box<dyn container::StyleSheet + 'a>, style: <Renderer::Theme as container::StyleSheet>::Style,
} }
impl<'a, Message, Renderer> Content<'a, Message, Renderer> impl<'a, Message, Renderer> Content<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// Creates a new [`Content`] with the provided body. /// Creates a new [`Content`] with the provided body.
pub fn new(body: impl Into<Element<'a, Message, Renderer>>) -> Self { pub fn new(body: impl Into<Element<'a, Message, Renderer>>) -> Self {
Self { Self {
title_bar: None, title_bar: None,
body: body.into(), body: body.into(),
style_sheet: Default::default(), style: Default::default(),
} }
} }
@ -42,9 +47,9 @@ where
/// Sets the style of the [`Content`]. /// Sets the style of the [`Content`].
pub fn style( pub fn style(
mut self, mut self,
style_sheet: impl Into<Box<dyn container::StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as container::StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style_sheet.into(); self.style = style.into();
self self
} }
} }
@ -52,6 +57,7 @@ where
impl<'a, Message, Renderer> Content<'a, Message, Renderer> impl<'a, Message, Renderer> Content<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// Draws the [`Content`] with the provided [`Renderer`] and [`Layout`]. /// Draws the [`Content`] with the provided [`Renderer`] and [`Layout`].
/// ///
@ -65,10 +71,12 @@ where
cursor_position: Point, cursor_position: Point,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
use container::StyleSheet;
let bounds = layout.bounds(); let bounds = layout.bounds();
{ {
let style = self.style_sheet.style(); let style = theme.appearance(self.style);
container::draw_background(renderer, &style, bounds); container::draw_background(renderer, &style, bounds);
} }
@ -248,6 +256,7 @@ where
impl<'a, Message, Renderer> Draggable for &Content<'a, Message, Renderer> impl<'a, Message, Renderer> Draggable for &Content<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn can_be_dragged_at( fn can_be_dragged_at(
&self, &self,
@ -269,6 +278,7 @@ impl<'a, T, Message, Renderer> From<T> for Content<'a, Message, Renderer>
where where
T: Into<Element<'a, Message, Renderer>>, T: Into<Element<'a, Message, Renderer>>,
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn from(element: T) -> Self { fn from(element: T) -> Self {
Self::new(element) Self::new(element)

20
native/src/widget/pane_grid/title_bar.rs
View file

@ -12,17 +12,22 @@ use crate::{
/// ///
/// [`Pane`]: crate::widget::pane_grid::Pane /// [`Pane`]: crate::widget::pane_grid::Pane
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct TitleBar<'a, Message, Renderer> { pub struct TitleBar<'a, Message, Renderer>
where
Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{
content: Element<'a, Message, Renderer>, content: Element<'a, Message, Renderer>,
controls: Option<Element<'a, Message, Renderer>>, controls: Option<Element<'a, Message, Renderer>>,
padding: Padding, padding: Padding,
always_show_controls: bool, always_show_controls: bool,
style_sheet: Box<dyn container::StyleSheet + 'a>, style: <Renderer::Theme as container::StyleSheet>::Style,
} }
impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer> impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// Creates a new [`TitleBar`] with the given content. /// Creates a new [`TitleBar`] with the given content.
pub fn new<E>(content: E) -> Self pub fn new<E>(content: E) -> Self
@ -34,7 +39,7 @@ where
controls: None, controls: None,
padding: Padding::ZERO, padding: Padding::ZERO,
always_show_controls: false, always_show_controls: false,
style_sheet: Default::default(), style: Default::default(),
} }
} }
@ -56,9 +61,9 @@ where
/// Sets the style of the [`TitleBar`]. /// Sets the style of the [`TitleBar`].
pub fn style( pub fn style(
mut self, mut self,
style: impl Into<Box<dyn container::StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as container::StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style.into(); self.style = style.into();
self self
} }
@ -79,6 +84,7 @@ where
impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer> impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// Draws the [`TitleBar`] with the provided [`Renderer`] and [`Layout`]. /// Draws the [`TitleBar`] with the provided [`Renderer`] and [`Layout`].
/// ///
@ -93,8 +99,10 @@ where
viewport: &Rectangle, viewport: &Rectangle,
show_controls: bool, show_controls: bool,
) { ) {
use container::StyleSheet;
let bounds = layout.bounds(); let bounds = layout.bounds();
let style = self.style_sheet.style(); let style = theme.appearance(self.style);
let inherited_style = renderer::Style { let inherited_style = renderer::Style {
text_color: style.text_color.unwrap_or(inherited_style.text_color), text_color: style.text_color.unwrap_or(inherited_style.text_color),
}; };

7
native/src/widget/pick_list.rs
View file

@ -9,6 +9,7 @@ use crate::overlay::menu::{self, Menu};
use crate::renderer; use crate::renderer;
use crate::text::{self, Text}; use crate::text::{self, Text};
use crate::touch; use crate::touch;
use crate::widget::container;
use crate::widget::scrollable; use crate::widget::scrollable;
use crate::{ use crate::{
Clipboard, Element, Layout, Length, Padding, Point, Rectangle, Shell, Size, Clipboard, Element, Layout, Length, Padding, Point, Rectangle, Shell, Size,
@ -323,7 +324,7 @@ pub fn overlay<'a, T, Message, Renderer>(
where where
Message: 'a, Message: 'a,
Renderer: text::Renderer + 'a, Renderer: text::Renderer + 'a,
Renderer::Theme: scrollable::StyleSheet, Renderer::Theme: container::StyleSheet + scrollable::StyleSheet,
T: Clone + ToString, T: Clone + ToString,
{ {
if state.is_open { if state.is_open {
@ -432,7 +433,7 @@ where
[T]: ToOwned<Owned = Vec<T>>, [T]: ToOwned<Owned = Vec<T>>,
Message: 'static, Message: 'static,
Renderer: text::Renderer + 'a, Renderer: text::Renderer + 'a,
Renderer::Theme: scrollable::StyleSheet, Renderer::Theme: container::StyleSheet + scrollable::StyleSheet,
{ {
fn width(&self) -> Length { fn width(&self) -> Length {
self.width self.width
@ -536,7 +537,7 @@ where
[T]: ToOwned<Owned = Vec<T>>, [T]: ToOwned<Owned = Vec<T>>,
Message: 'static, Message: 'static,
Renderer: text::Renderer + 'a, Renderer: text::Renderer + 'a,
Renderer::Theme: scrollable::StyleSheet, Renderer::Theme: container::StyleSheet + scrollable::StyleSheet,
{ {
fn into(self) -> Element<'a, Message, Renderer> { fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self) Element::new(self)

36
native/src/widget/tooltip.rs
View file

@ -13,18 +13,23 @@ use crate::{
/// An element to display a widget over another. /// An element to display a widget over another.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Tooltip<'a, Message, Renderer: text::Renderer> { pub struct Tooltip<'a, Message, Renderer>
where
Renderer: text::Renderer,
Renderer::Theme: container::StyleSheet,
{
content: Element<'a, Message, Renderer>, content: Element<'a, Message, Renderer>,
tooltip: Text<Renderer>, tooltip: Text<Renderer>,
position: Position, position: Position,
style_sheet: Box<dyn container::StyleSheet + 'a>,
gap: u16, gap: u16,
padding: u16, padding: u16,
style: <Renderer::Theme as container::StyleSheet>::Style,
} }
impl<'a, Message, Renderer> Tooltip<'a, Message, Renderer> impl<'a, Message, Renderer> Tooltip<'a, Message, Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// The default padding of a [`Tooltip`] drawn by this renderer. /// The default padding of a [`Tooltip`] drawn by this renderer.
const DEFAULT_PADDING: u16 = 5; const DEFAULT_PADDING: u16 = 5;
@ -41,9 +46,9 @@ where
content: content.into(), content: content.into(),
tooltip: Text::new(tooltip.to_string()), tooltip: Text::new(tooltip.to_string()),
position, position,
style_sheet: Default::default(),
gap: 0, gap: 0,
padding: Self::DEFAULT_PADDING, padding: Self::DEFAULT_PADDING,
style: Default::default(),
} }
} }
@ -76,9 +81,9 @@ where
/// Sets the style of the [`Tooltip`]. /// Sets the style of the [`Tooltip`].
pub fn style( pub fn style(
mut self, mut self,
style_sheet: impl Into<Box<dyn container::StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as container::StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style_sheet.into(); self.style = style.into();
self self
} }
} }
@ -99,8 +104,9 @@ pub enum Position {
} }
/// Draws a [`Tooltip`]. /// Draws a [`Tooltip`].
pub fn draw<Renderer: crate::Renderer>( pub fn draw<Renderer>(
renderer: &mut Renderer, renderer: &mut Renderer,
theme: &Renderer::Theme,
inherited_style: &renderer::Style, inherited_style: &renderer::Style,
layout: Layout<'_>, layout: Layout<'_>,
cursor_position: Point, cursor_position: Point,
@ -108,7 +114,7 @@ pub fn draw<Renderer: crate::Renderer>(
position: Position, position: Position,
gap: u16, gap: u16,
padding: u16, padding: u16,
style_sheet: &dyn container::StyleSheet, style: <Renderer::Theme as container::StyleSheet>::Style,
layout_text: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node, layout_text: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
draw_text: impl FnOnce( draw_text: impl FnOnce(
&mut Renderer, &mut Renderer,
@ -117,12 +123,17 @@ pub fn draw<Renderer: crate::Renderer>(
Point, Point,
&Rectangle, &Rectangle,
), ),
) { ) where
Renderer: crate::Renderer,
Renderer::Theme: container::StyleSheet,
{
use container::StyleSheet;
let bounds = layout.bounds(); let bounds = layout.bounds();
if bounds.contains(cursor_position) { if bounds.contains(cursor_position) {
let gap = f32::from(gap); let gap = f32::from(gap);
let style = style_sheet.style(); let style = theme.appearance(style);
let defaults = renderer::Style { let defaults = renderer::Style {
text_color: style.text_color.unwrap_or(inherited_style.text_color), text_color: style.text_color.unwrap_or(inherited_style.text_color),
@ -213,6 +224,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
for Tooltip<'a, Message, Renderer> for Tooltip<'a, Message, Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn width(&self) -> Length { fn width(&self) -> Length {
self.content.width() self.content.width()
@ -286,6 +298,7 @@ where
draw( draw(
renderer, renderer,
theme,
inherited_style, inherited_style,
layout, layout,
cursor_position, cursor_position,
@ -293,7 +306,7 @@ where
self.position, self.position,
self.gap, self.gap,
self.padding, self.padding,
self.style_sheet.as_ref(), self.style,
|renderer, limits| { |renderer, limits| {
Widget::<(), Renderer>::layout(tooltip, renderer, limits) Widget::<(), Renderer>::layout(tooltip, renderer, limits)
}, },
@ -315,8 +328,9 @@ where
impl<'a, Message, Renderer> From<Tooltip<'a, Message, Renderer>> impl<'a, Message, Renderer> From<Tooltip<'a, Message, Renderer>>
for Element<'a, Message, Renderer> for Element<'a, Message, Renderer>
where where
Renderer: 'a + text::Renderer,
Message: 'a, Message: 'a,
Renderer: 'a + text::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn from( fn from(
tooltip: Tooltip<'a, Message, Renderer>, tooltip: Tooltip<'a, Message, Renderer>,

2
pure/src/helpers.rs
View file

@ -14,6 +14,7 @@ pub fn container<'a, Message, Renderer>(
) -> widget::Container<'a, Message, Renderer> ) -> widget::Container<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: widget::container::StyleSheet,
{ {
widget::Container::new(content) widget::Container::new(content)
} }
@ -70,6 +71,7 @@ pub fn tooltip<'a, Message, Renderer>(
) -> widget::Tooltip<'a, Message, Renderer> ) -> widget::Tooltip<'a, Message, Renderer>
where where
Renderer: iced_native::text::Renderer, Renderer: iced_native::text::Renderer,
Renderer::Theme: widget::container::StyleSheet,
{ {
widget::Tooltip::new(content, tooltip, position) widget::Tooltip::new(content, tooltip, position)
} }

23
pure/src/widget/container.rs
View file

@ -15,13 +15,17 @@ use iced_native::{
use std::u32; use std::u32;
pub use iced_style::container::{Style, StyleSheet}; pub use iced_style::container::{Appearance, StyleSheet};
/// 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 Container<'a, Message, Renderer> { pub struct Container<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{
padding: Padding, padding: Padding,
width: Length, width: Length,
height: Length, height: Length,
@ -29,13 +33,14 @@ pub struct Container<'a, Message, Renderer> {
max_height: u32, max_height: u32,
horizontal_alignment: alignment::Horizontal, horizontal_alignment: alignment::Horizontal,
vertical_alignment: alignment::Vertical, vertical_alignment: alignment::Vertical,
style_sheet: Box<dyn StyleSheet + 'a>, style: <Renderer::Theme as StyleSheet>::Style,
content: Element<'a, Message, Renderer>, content: Element<'a, Message, Renderer>,
} }
impl<'a, Message, Renderer> Container<'a, Message, Renderer> impl<'a, Message, Renderer> Container<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// Creates an empty [`Container`]. /// Creates an empty [`Container`].
pub fn new<T>(content: T) -> Self pub fn new<T>(content: T) -> Self
@ -50,7 +55,7 @@ where
max_height: u32::MAX, max_height: u32::MAX,
horizontal_alignment: alignment::Horizontal::Left, horizontal_alignment: alignment::Horizontal::Left,
vertical_alignment: alignment::Vertical::Top, vertical_alignment: alignment::Vertical::Top,
style_sheet: Default::default(), style: Default::default(),
content: content.into(), content: content.into(),
} }
} }
@ -112,9 +117,9 @@ where
/// Sets the style of the [`Container`]. /// Sets the style of the [`Container`].
pub fn style( pub fn style(
mut self, mut self,
style_sheet: impl Into<Box<dyn StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style_sheet.into(); self.style = style.into();
self self
} }
} }
@ -123,6 +128,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
for Container<'a, Message, Renderer> for Container<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet,
{ {
fn children(&self) -> Vec<Tree> { fn children(&self) -> Vec<Tree> {
vec![Tree::new(&self.content)] vec![Tree::new(&self.content)]
@ -207,7 +213,7 @@ where
cursor_position: Point, cursor_position: Point,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
let style = self.style_sheet.style(); let style = theme.appearance(self.style);
container::draw_background(renderer, &style, layout.bounds()); container::draw_background(renderer, &style, layout.bounds());
@ -243,8 +249,9 @@ where
impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>> impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>>
for Element<'a, Message, Renderer> for Element<'a, Message, Renderer>
where where
Renderer: 'a + iced_native::Renderer,
Message: 'a, Message: 'a,
Renderer: 'a + iced_native::Renderer,
Renderer::Theme: StyleSheet,
{ {
fn from( fn from(
column: Container<'a, Message, Renderer>, column: Container<'a, Message, Renderer>,

9
pure/src/widget/pane_grid.rs
View file

@ -19,6 +19,7 @@ pub use iced_native::widget::pane_grid::{
}; };
use crate::overlay; use crate::overlay;
use crate::widget::container;
use crate::widget::tree::{self, Tree}; use crate::widget::tree::{self, Tree};
use crate::{Element, Widget}; use crate::{Element, Widget};
@ -86,7 +87,7 @@ pub use iced_style::pane_grid::{Line, StyleSheet};
pub struct PaneGrid<'a, Message, Renderer> pub struct PaneGrid<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
state: &'a state::Internal, state: &'a state::Internal,
elements: Vec<(Pane, Content<'a, Message, Renderer>)>, elements: Vec<(Pane, Content<'a, Message, Renderer>)>,
@ -102,7 +103,7 @@ where
impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
/// Creates a [`PaneGrid`] with the given [`State`] and view function. /// Creates a [`PaneGrid`] with the given [`State`] and view function.
/// ///
@ -202,7 +203,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
for PaneGrid<'a, Message, Renderer> for PaneGrid<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
fn tag(&self) -> tree::Tag { fn tag(&self) -> tree::Tag {
tree::Tag::of::<state::Action>() tree::Tag::of::<state::Action>()
@ -403,7 +404,7 @@ impl<'a, Message, Renderer> From<PaneGrid<'a, Message, Renderer>>
where where
Message: 'a, Message: 'a,
Renderer: 'a + iced_native::Renderer, Renderer: 'a + iced_native::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet + container::StyleSheet,
{ {
fn from( fn from(
pane_grid: PaneGrid<'a, Message, Renderer>, pane_grid: PaneGrid<'a, Message, Renderer>,

22
pure/src/widget/pane_grid/content.rs
View file

@ -15,22 +15,27 @@ use iced_native::{Clipboard, Layout, Point, Rectangle, Shell, Size};
/// ///
/// [`Pane`]: crate::widget::pane_grid::Pane /// [`Pane`]: crate::widget::pane_grid::Pane
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Content<'a, Message, Renderer> { pub struct Content<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{
title_bar: Option<TitleBar<'a, Message, Renderer>>, title_bar: Option<TitleBar<'a, Message, Renderer>>,
body: Element<'a, Message, Renderer>, body: Element<'a, Message, Renderer>,
style_sheet: Box<dyn container::StyleSheet + 'a>, style: <Renderer::Theme as container::StyleSheet>::Style,
} }
impl<'a, Message, Renderer> Content<'a, Message, Renderer> impl<'a, Message, Renderer> Content<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// Creates a new [`Content`] with the provided body. /// Creates a new [`Content`] with the provided body.
pub fn new(body: impl Into<Element<'a, Message, Renderer>>) -> Self { pub fn new(body: impl Into<Element<'a, Message, Renderer>>) -> Self {
Self { Self {
title_bar: None, title_bar: None,
body: body.into(), body: body.into(),
style_sheet: Default::default(), style: Default::default(),
} }
} }
@ -46,9 +51,9 @@ where
/// Sets the style of the [`Content`]. /// Sets the style of the [`Content`].
pub fn style( pub fn style(
mut self, mut self,
style_sheet: impl Into<Box<dyn container::StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as container::StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style_sheet.into(); self.style = style.into();
self self
} }
} }
@ -56,6 +61,7 @@ where
impl<'a, Message, Renderer> Content<'a, Message, Renderer> impl<'a, Message, Renderer> Content<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
pub(super) fn state(&self) -> Tree { pub(super) fn state(&self) -> Tree {
let children = if let Some(title_bar) = self.title_bar.as_ref() { let children = if let Some(title_bar) = self.title_bar.as_ref() {
@ -95,10 +101,12 @@ where
cursor_position: Point, cursor_position: Point,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
use container::StyleSheet;
let bounds = layout.bounds(); let bounds = layout.bounds();
{ {
let style = self.style_sheet.style(); let style = theme.appearance(self.style);
container::draw_background(renderer, &style, bounds); container::draw_background(renderer, &style, bounds);
} }
@ -307,6 +315,7 @@ where
impl<'a, Message, Renderer> Draggable for &Content<'a, Message, Renderer> impl<'a, Message, Renderer> Draggable for &Content<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn can_be_dragged_at( fn can_be_dragged_at(
&self, &self,
@ -328,6 +337,7 @@ impl<'a, T, Message, Renderer> From<T> for Content<'a, Message, Renderer>
where where
T: Into<Element<'a, Message, Renderer>>, T: Into<Element<'a, Message, Renderer>>,
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn from(element: T) -> Self { fn from(element: T) -> Self {
Self::new(element) Self::new(element)

20
pure/src/widget/pane_grid/title_bar.rs
View file

@ -13,17 +13,22 @@ use iced_native::{Clipboard, Layout, Padding, Point, Rectangle, Shell, Size};
/// ///
/// [`Pane`]: crate::widget::pane_grid::Pane /// [`Pane`]: crate::widget::pane_grid::Pane
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct TitleBar<'a, Message, Renderer> { pub struct TitleBar<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{
content: Element<'a, Message, Renderer>, content: Element<'a, Message, Renderer>,
controls: Option<Element<'a, Message, Renderer>>, controls: Option<Element<'a, Message, Renderer>>,
padding: Padding, padding: Padding,
always_show_controls: bool, always_show_controls: bool,
style_sheet: Box<dyn container::StyleSheet + 'a>, style: <Renderer::Theme as container::StyleSheet>::Style,
} }
impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer> impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// Creates a new [`TitleBar`] with the given content. /// Creates a new [`TitleBar`] with the given content.
pub fn new<E>(content: E) -> Self pub fn new<E>(content: E) -> Self
@ -35,7 +40,7 @@ where
controls: None, controls: None,
padding: Padding::ZERO, padding: Padding::ZERO,
always_show_controls: false, always_show_controls: false,
style_sheet: Default::default(), style: Default::default(),
} }
} }
@ -57,9 +62,9 @@ where
/// Sets the style of the [`TitleBar`]. /// Sets the style of the [`TitleBar`].
pub fn style( pub fn style(
mut self, mut self,
style: impl Into<Box<dyn container::StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as container::StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style.into(); self.style = style.into();
self self
} }
@ -80,6 +85,7 @@ where
impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer> impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
where where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
pub(super) fn state(&self) -> Tree { pub(super) fn state(&self) -> Tree {
let children = if let Some(controls) = self.controls.as_ref() { let children = if let Some(controls) = self.controls.as_ref() {
@ -120,8 +126,10 @@ where
viewport: &Rectangle, viewport: &Rectangle,
show_controls: bool, show_controls: bool,
) { ) {
use container::StyleSheet;
let bounds = layout.bounds(); let bounds = layout.bounds();
let style = self.style_sheet.style(); let style = theme.appearance(self.style);
let inherited_style = renderer::Style { let inherited_style = renderer::Style {
text_color: style.text_color.unwrap_or(inherited_style.text_color), text_color: style.text_color.unwrap_or(inherited_style.text_color),
}; };

5
pure/src/widget/pick_list.rs
View file

@ -1,4 +1,5 @@
//! Display a dropdown list of selectable values. //! Display a dropdown list of selectable values.
use crate::widget::container;
use crate::widget::scrollable; use crate::widget::scrollable;
use crate::widget::tree::{self, Tree}; use crate::widget::tree::{self, Tree};
use crate::{Element, Widget}; use crate::{Element, Widget};
@ -111,7 +112,7 @@ where
[T]: ToOwned<Owned = Vec<T>>, [T]: ToOwned<Owned = Vec<T>>,
Message: 'a, Message: 'a,
Renderer: text::Renderer + 'a, Renderer: text::Renderer + 'a,
Renderer::Theme: scrollable::StyleSheet, Renderer::Theme: container::StyleSheet + scrollable::StyleSheet,
{ {
fn tag(&self) -> tree::Tag { fn tag(&self) -> tree::Tag {
tree::Tag::of::<pick_list::State<T>>() tree::Tag::of::<pick_list::State<T>>()
@ -229,7 +230,7 @@ where
[T]: ToOwned<Owned = Vec<T>>, [T]: ToOwned<Owned = Vec<T>>,
Message: 'a, Message: 'a,
Renderer: text::Renderer + 'a, Renderer: text::Renderer + 'a,
Renderer::Theme: scrollable::StyleSheet, Renderer::Theme: container::StyleSheet + scrollable::StyleSheet,
{ {
fn into(self) -> Element<'a, Message, Renderer> { fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self) Element::new(self)

25
pure/src/widget/tooltip.rs
View file

@ -7,27 +7,33 @@ use iced_native::mouse;
use iced_native::overlay; use iced_native::overlay;
use iced_native::renderer; use iced_native::renderer;
use iced_native::text; use iced_native::text;
use iced_native::widget::container;
use iced_native::widget::tooltip; use iced_native::widget::tooltip;
use iced_native::widget::Text; use iced_native::widget::Text;
use iced_native::{Clipboard, Layout, Length, Point, Rectangle, Shell}; use iced_native::{Clipboard, Layout, Length, Point, Rectangle, Shell};
pub use iced_style::container::{Style, StyleSheet}; pub use iced_style::container::{Appearance, StyleSheet};
pub use tooltip::Position; pub use tooltip::Position;
/// An element to display a widget over another. /// An element to display a widget over another.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Tooltip<'a, Message, Renderer: text::Renderer> { pub struct Tooltip<'a, Message, Renderer: text::Renderer>
where
Renderer: text::Renderer,
Renderer::Theme: container::StyleSheet,
{
content: Element<'a, Message, Renderer>, content: Element<'a, Message, Renderer>,
tooltip: Text<Renderer>, tooltip: Text<Renderer>,
position: Position, position: Position,
style_sheet: Box<dyn StyleSheet + 'a>,
gap: u16, gap: u16,
padding: u16, padding: u16,
style: <Renderer::Theme as container::StyleSheet>::Style,
} }
impl<'a, Message, Renderer> Tooltip<'a, Message, Renderer> impl<'a, Message, Renderer> Tooltip<'a, Message, Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
/// The default padding of a [`Tooltip`] drawn by this renderer. /// The default padding of a [`Tooltip`] drawn by this renderer.
const DEFAULT_PADDING: u16 = 5; const DEFAULT_PADDING: u16 = 5;
@ -44,9 +50,9 @@ where
content: content.into(), content: content.into(),
tooltip: Text::new(tooltip.to_string()), tooltip: Text::new(tooltip.to_string()),
position, position,
style_sheet: Default::default(),
gap: 0, gap: 0,
padding: Self::DEFAULT_PADDING, padding: Self::DEFAULT_PADDING,
style: Default::default(),
} }
} }
@ -79,9 +85,9 @@ where
/// Sets the style of the [`Tooltip`]. /// Sets the style of the [`Tooltip`].
pub fn style( pub fn style(
mut self, mut self,
style_sheet: impl Into<Box<dyn StyleSheet + 'a>>, style: impl Into<<Renderer::Theme as container::StyleSheet>::Style>,
) -> Self { ) -> Self {
self.style_sheet = style_sheet.into(); self.style = style.into();
self self
} }
} }
@ -90,6 +96,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
for Tooltip<'a, Message, Renderer> for Tooltip<'a, Message, Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn children(&self) -> Vec<Tree> { fn children(&self) -> Vec<Tree> {
vec![Tree::new(&self.content)] vec![Tree::new(&self.content)]
@ -177,6 +184,7 @@ where
tooltip::draw( tooltip::draw(
renderer, renderer,
theme,
inherited_style, inherited_style,
layout, layout,
cursor_position, cursor_position,
@ -184,7 +192,7 @@ where
self.position, self.position,
self.gap, self.gap,
self.padding, self.padding,
self.style_sheet.as_ref(), self.style,
|renderer, limits| { |renderer, limits| {
Widget::<(), Renderer>::layout(tooltip, renderer, limits) Widget::<(), Renderer>::layout(tooltip, renderer, limits)
}, },
@ -220,8 +228,9 @@ where
impl<'a, Message, Renderer> From<Tooltip<'a, Message, Renderer>> impl<'a, Message, Renderer> From<Tooltip<'a, Message, Renderer>>
for Element<'a, Message, Renderer> for Element<'a, Message, Renderer>
where where
Renderer: 'a + text::Renderer,
Message: 'a, Message: 'a,
Renderer: 'a + text::Renderer,
Renderer::Theme: container::StyleSheet,
{ {
fn from( fn from(
tooltip: Tooltip<'a, Message, Renderer>, tooltip: Tooltip<'a, Message, Renderer>,

2
src/pure/widget.rs
View file

@ -32,7 +32,7 @@ pub mod checkbox {
pub mod container { pub mod container {
//! Decorate content and apply alignment. //! Decorate content and apply alignment.
pub use iced_pure::widget::container::{Style, StyleSheet}; pub use iced_pure::widget::container::{Appearance, StyleSheet};
/// An element decorating some content. /// An element decorating some content.
pub type Container<'a, Message, Theme = crate::Theme> = pub type Container<'a, Message, Theme = crate::Theme> =

2
src/widget.rs
View file

@ -48,7 +48,7 @@ pub mod checkbox {
pub mod container { pub mod container {
//! Decorate content and apply alignment. //! Decorate content and apply alignment.
pub use iced_native::widget::container::{Style, StyleSheet}; pub use iced_native::widget::container::{Appearance, StyleSheet};
/// An element decorating some content. /// An element decorating some content.
pub type Container<'a, Message, Theme = crate::Theme> = pub type Container<'a, Message, Theme = crate::Theme> =

39
style/src/container.rs
View file

@ -3,7 +3,7 @@ use iced_core::{Background, Color};
/// The appearance of a container. /// The appearance of a container.
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub struct Style { pub struct Appearance {
pub text_color: Option<Color>, pub text_color: Option<Color>,
pub background: Option<Background>, pub background: Option<Background>,
pub border_radius: f32, pub border_radius: f32,
@ -11,7 +11,7 @@ pub struct Style {
pub border_color: Color, pub border_color: Color,
} }
impl std::default::Default for Style { impl std::default::Default for Appearance {
fn default() -> Self { fn default() -> Self {
Self { Self {
text_color: None, text_color: None,
@ -23,37 +23,10 @@ impl std::default::Default for Style {
} }
} }
/// A set of rules that dictate the style of a container. /// A set of rules that dictate the [`Appearance`] of a container.
pub trait StyleSheet { pub trait StyleSheet {
/// Produces the style of a container. type Style: Default + Copy;
fn style(&self) -> Style;
}
struct Default; /// Produces the [`Appearance`] of a container.
fn appearance(&self, style: Self::Style) -> Appearance;
impl StyleSheet for Default {
fn style(&self) -> Style {
Style {
text_color: None,
background: None,
border_radius: 0.0,
border_width: 0.0,
border_color: Color::TRANSPARENT,
}
}
}
impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
T: StyleSheet + 'a,
{
fn from(style_sheet: T) -> Self {
Box::new(style_sheet)
}
} }

46
style/src/theme.rs
View file

@ -5,6 +5,7 @@ pub use self::palette::Palette;
use crate::application; use crate::application;
use crate::button; use crate::button;
use crate::checkbox; use crate::checkbox;
use crate::container;
use crate::pane_grid; use crate::pane_grid;
use crate::progress_bar; use crate::progress_bar;
use crate::radio; use crate::radio;
@ -127,7 +128,6 @@ impl button::StyleSheet for Theme {
/* /*
* Checkbox * Checkbox
*/ */
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Checkbox { pub enum Checkbox {
Primary, Primary,
@ -227,6 +227,50 @@ fn checkbox_appearance(
} }
} }
/*
* Container
*/
#[derive(Clone, Copy)]
pub enum Container {
Transparent,
Box,
Custom(fn(&Theme) -> container::Appearance),
}
impl Default for Container {
fn default() -> Self {
Self::Transparent
}
}
impl From<fn(&Theme) -> container::Appearance> for Container {
fn from(f: fn(&Theme) -> container::Appearance) -> Self {
Self::Custom(f)
}
}
impl container::StyleSheet for Theme {
type Style = Container;
fn appearance(&self, style: Self::Style) -> container::Appearance {
match style {
Container::Transparent => Default::default(),
Container::Box => {
let palette = self.extended_palette();
container::Appearance {
text_color: None,
background: palette.background.weak.color.into(),
border_radius: 2.0,
border_width: 0.0,
border_color: Color::TRANSPARENT,
}
}
Container::Custom(f) => f(self),
}
}
}
/* /*
* Slider * Slider
*/ */