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

Draft first-class Theme support

Browse source 
RFC: https://github.com/iced-rs/rfcs/pull/6
This commit is contained in:
Héctor Ramón Jiménez 2022-05-14 01:47:55 +02:00
parent 5de337f214
commit 664251f3f5
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
113 changed files with 767 additions and 878 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/clock/src/main.rs
View file

@ -1,7 +1,10 @@
use iced::canvas::{
self, Cache, Canvas, Cursor, Geometry, LineCap, Path, Stroke,
};
use iced::executor;
use iced::{
canvas::{self, Cache, Canvas, Cursor, Geometry, LineCap, Path, Stroke},
executor, Application, Color, Command, Container, Element, Length, Point,
Rectangle, Settings, Subscription, Vector,
Application, Color, Command, Container, Element, Length, Point, Rectangle,
Settings, Subscription, Theme, Vector,
};
pub fn main() -> iced::Result {
@ -22,8 +25,9 @@ enum Message {
}
impl Application for Clock {
type Executor = executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
fn new(_flags: ()) -> (Self, Command<Message>) {

4
examples/component/src/main.rs
View file

@ -95,6 +95,8 @@ mod numeric_input {
for NumericInput<'a, Message>
where
Renderer: 'a + text::Renderer,
Renderer::Theme: button::StyleSheet,
<Renderer::Theme as button::StyleSheet>::Variant: Default + Copy,
{
type Event = Event;
@ -172,6 +174,8 @@ mod numeric_input {
where
Message: 'a,
Renderer: text::Renderer + 'a,
Renderer::Theme: button::StyleSheet,
<Renderer::Theme as button::StyleSheet>::Variant: Default + Copy,
{
fn from(numeric_input: NumericInput<'a, Message>) -> Self {
component::view(numeric_input)

5
examples/counter/src/main.rs
View file

@ -1,6 +1,5 @@
use iced::{
button, Alignment, Button, Column, Element, Sandbox, Settings, Text,
};
use iced::button::{self, Button};
use iced::{Alignment, Column, Element, Sandbox, Settings, Text};
pub fn main() -> iced::Result {
Counter::run(Settings::default())

1
examples/custom_widget/src/main.rs
View file

@ -46,6 +46,7 @@ mod circle {
fn draw(
&self,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

9
examples/download_progress/src/main.rs
View file

@ -1,6 +1,8 @@
use iced::button;
use iced::executor;
use iced::{
button, executor, Alignment, Application, Button, Column, Command,
Container, Element, Length, ProgressBar, Settings, Subscription, Text,
Alignment, Application, Button, Column, Command, Container, Element,
Length, ProgressBar, Settings, Subscription, Text, Theme,
};
mod download;
@ -24,8 +26,9 @@ pub enum Message {
}
impl Application for Example {
type Executor = executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
fn new(_flags: ()) -> (Example, Command<Message>) {

10
examples/events/src/main.rs
View file

@ -1,6 +1,9 @@
use iced::alignment;
use iced::button;
use iced::executor;
use iced::{
alignment, button, executor, Alignment, Application, Button, Checkbox,
Column, Command, Container, Element, Length, Settings, Subscription, Text,
Alignment, Application, Button, Checkbox, Column, Command, Container,
Element, Length, Settings, Subscription, Text, Theme,
};
use iced_native::{window, Event};
@ -27,8 +30,9 @@ enum Message {
}
impl Application for Events {
type Executor = executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
fn new(_flags: ()) -> (Events, Command<Message>) {

8
examples/game_of_life/src/main.rs
View file

@ -8,6 +8,7 @@ use iced::button::{self, Button};
use iced::executor;
use iced::pick_list::{self, PickList};
use iced::slider::{self, Slider};
use iced::theme::{self, Theme};
use iced::time;
use iced::window;
use iced::{
@ -55,6 +56,7 @@ enum Message {
impl Application for GameOfLife {
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
@ -836,12 +838,12 @@ impl Controls {
Text::new(if is_playing { "Pause" } else { "Play" }),
)
.on_press(Message::TogglePlayback)
.style(style::Button),
.style(theme::Button::Primary),
)
.push(
Button::new(&mut self.next_button, Text::new("Next"))
.on_press(Message::Next)
.style(style::Button),
.style(theme::Button::Secondary),
);
let speed_controls = Row::new()
@ -885,7 +887,7 @@ impl Controls {
.push(
Button::new(&mut self.clear_button, Text::new("Clear"))
.on_press(Message::Clear)
.style(style::Clear),
.style(theme::Button::Destructive),
)
.into()
}

69
examples/game_of_life/src/style.rs
View file

@ -1,4 +1,4 @@
use iced::{button, container, pick_list, slider, Background, Color};
use iced::{container, pick_list, slider, Background, Color};
const ACTIVE: Color = Color::from_rgb(
0x72 as f32 / 255.0,
@ -6,12 +6,6 @@ const ACTIVE: Color = Color::from_rgb(
0xDA as f32 / 255.0,
);
const DESTRUCTIVE: Color = Color::from_rgb(
0xC0 as f32 / 255.0,
0x47 as f32 / 255.0,
0x47 as f32 / 255.0,
);
const HOVERED: Color = Color::from_rgb(
0x67 as f32 / 255.0,
0x7B as f32 / 255.0,
@ -38,67 +32,6 @@ impl container::StyleSheet for Container {
}
}
pub struct Button;
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(ACTIVE)),
border_radius: 3.0,
text_color: Color::WHITE,
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
background: Some(Background::Color(HOVERED)),
text_color: Color::WHITE,
..self.active()
}
}
fn pressed(&self) -> button::Style {
button::Style {
border_width: 1.0,
border_color: Color::WHITE,
..self.hovered()
}
}
}
pub struct Clear;
impl button::StyleSheet for Clear {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(DESTRUCTIVE)),
border_radius: 3.0,
text_color: Color::WHITE,
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
background: Some(Background::Color(Color {
a: 0.5,
..DESTRUCTIVE
})),
text_color: Color::WHITE,
..self.active()
}
}
fn pressed(&self) -> button::Style {
button::Style {
border_width: 1.0,
border_color: Color::WHITE,
..self.hovered()
}
}
}
pub struct Slider;
impl slider::StyleSheet for Slider {

11
examples/geometry/src/main.rs
View file

@ -25,7 +25,7 @@ mod rainbow {
}
}
impl<Message, B> Widget<Message, Renderer<B>> for Rainbow
impl<Message, B, T> Widget<Message, Renderer<B, T>> for Rainbow
where
B: Backend,
{
@ -39,7 +39,7 @@ mod rainbow {
fn layout(
&self,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
limits: &layout::Limits,
) -> layout::Node {
let size = limits.width(Length::Fill).resolve(Size::ZERO);
@ -49,7 +49,8 @@ mod rainbow {
fn draw(
&self,
renderer: &mut Renderer<B>,
renderer: &mut Renderer<B, T>,
_theme: &T,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -147,11 +148,11 @@ mod rainbow {
}
}
impl<'a, Message, B> Into<Element<'a, Message, Renderer<B>>> for Rainbow
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>> for Rainbow
where
B: Backend,
{
fn into(self) -> Element<'a, Message, Renderer<B>> {
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
Element::new(self)
}
}

1
examples/integration_opengl/src/main.rs
View file

@ -125,6 +125,7 @@ pub fn main() {
viewport.scale_factor(),
),
&mut renderer,
&iced_glow::Theme::Dark,
&mut clipboard,
&mut debug,
);

1
examples/integration_wgpu/src/main.rs
View file

@ -188,6 +188,7 @@ pub fn main() {
viewport.scale_factor(),
),
&mut renderer,
&iced_wgpu::Theme::Dark,
&mut clipboard,
&mut debug,
);

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

@ -4,6 +4,7 @@ use iced::executor;
use iced::keyboard;
use iced::pane_grid::{self, PaneGrid};
use iced::scrollable::{self, Scrollable};
use iced::theme::{self, Theme};
use iced::{
Application, Color, Column, Command, Container, Element, Length, Row,
Settings, Size, Subscription, Text,
@ -36,6 +37,7 @@ enum Message {
impl Application for Example {
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
@ -171,7 +173,7 @@ impl Application for Example {
let text = if *is_pinned { "Unpin" } else { "Pin" };
let pin_button = Button::new(pin_button, Text::new(text).size(14))
.on_press(Message::TogglePin(id))
.style(style::Button::Pin)
.style(theme::Button::Secondary)
.padding(3);
let title = Row::with_children(vec![
@ -309,7 +311,7 @@ impl Content {
..
} = self;
let button = |state, label, message, style| {
let button = |state, label, message| {
Button::new(
state,
Text::new(label)
@ -320,7 +322,6 @@ impl Content {
.width(Length::Fill)
.padding(8)
.on_press(message)
.style(style)
};
let mut controls = Column::new()
@ -330,22 +331,18 @@ impl Content {
split_horizontally,
"Split horizontally",
Message::Split(pane_grid::Axis::Horizontal, pane),
style::Button::Primary,
))
.push(button(
split_vertically,
"Split vertically",
Message::Split(pane_grid::Axis::Vertical, pane),
style::Button::Primary,
));
if total_panes > 1 && !is_pinned {
controls = controls.push(button(
close,
"Close",
Message::Close(pane),
style::Button::Destructive,
));
controls = controls.push(
button(close, "Close", Message::Close(pane))
.style(theme::Button::Destructive),
);
}
let content = Scrollable::new(scroll)
@ -379,8 +376,9 @@ impl Controls {
) -> Element<Message> {
let mut button =
Button::new(&mut self.close, Text::new("Close").size(14))
.style(style::Button::Control)
.style(theme::Button::Destructive)
.padding(3);
if total_panes > 1 && !is_pinned {
button = button.on_press(Message::Close(pane));
}
@ -389,8 +387,7 @@ impl Controls {
}
mod style {
use crate::PANE_ID_COLOR_FOCUSED;
use iced::{button, container, Background, Color, Vector};
use iced::{container, Background, Color};
const SURFACE: Color = Color::from_rgb(
0xF2 as f32 / 255.0,
@ -398,18 +395,6 @@ mod style {
0xF5 as f32 / 255.0,
);
const ACTIVE: Color = Color::from_rgb(
0x72 as f32 / 255.0,
0x89 as f32 / 255.0,
0xDA as f32 / 255.0,
);
const HOVERED: Color = Color::from_rgb(
0x67 as f32 / 255.0,
0x7B as f32 / 255.0,
0xC4 as f32 / 255.0,
);
pub enum TitleBar {
Active,
Focused,
@ -449,51 +434,4 @@ mod style {
}
}
}
pub enum Button {
Primary,
Destructive,
Control,
Pin,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
let (background, text_color) = match self {
Button::Primary => (Some(ACTIVE), Color::WHITE),
Button::Destructive => {
(None, Color::from_rgb8(0xFF, 0x47, 0x47))
}
Button::Control => (Some(PANE_ID_COLOR_FOCUSED), Color::WHITE),
Button::Pin => (Some(ACTIVE), Color::WHITE),
};
button::Style {
text_color,
background: background.map(Background::Color),
border_radius: 5.0,
shadow_offset: Vector::new(0.0, 0.0),
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
let active = self.active();
let background = match self {
Button::Primary => Some(HOVERED),
Button::Destructive => Some(Color {
a: 0.2,
..active.text_color
}),
Button::Control => Some(PANE_ID_COLOR_FOCUSED),
Button::Pin => Some(HOVERED),
};
button::Style {
background: background.map(Background::Color),
..active
}
}
}
}

36
examples/pokedex/src/main.rs
View file

@ -1,6 +1,9 @@
use iced::button;
use iced::futures;
use iced::image;
use iced::{
button, futures, image, Alignment, Application, Button, Column, Command,
Container, Element, Length, Row, Settings, Text,
Alignment, Application, Button, Column, Command, Container, Element,
Length, Row, Settings, Text, Theme,
};
pub fn main() -> iced::Result {
@ -26,8 +29,9 @@ enum Message {
}
impl Application for Pokedex {
type Executor = iced::executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = iced::executor::Default;
type Flags = ();
fn new(_flags: ()) -> (Pokedex, Command<Message>) {
@ -238,29 +242,5 @@ impl From<reqwest::Error> for Error {
}
fn button<'a>(state: &'a mut button::State, text: &str) -> Button<'a, Message> {
Button::new(state, Text::new(text))
.padding(10)
.style(style::Button::Primary)
}
mod style {
use iced::{button, Background, Color, Vector};
pub enum Button {
Primary,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(match self {
Button::Primary => Color::from_rgb(0.11, 0.42, 0.87),
})),
border_radius: 12.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::WHITE,
..button::Style::default()
}
}
}
Button::new(state, Text::new(text)).padding(10)
}

9
examples/pure/component/src/main.rs
View file

@ -47,12 +47,13 @@ impl Sandbox for Component {
}
mod numeric_input {
use iced::pure::{button, row, text, text_input};
use iced_lazy::pure::{self, Component};
use iced_native::alignment::{self, Alignment};
use iced_native::text;
use iced_native::widget;
use iced_native::Length;
use iced_pure::Element;
use iced_pure::{button, row, text, text_input};
pub struct NumericInput<Message> {
value: Option<u32>,
@ -88,6 +89,9 @@ mod numeric_input {
impl<Message, Renderer> Component<Message, Renderer> for NumericInput<Message>
where
Renderer: text::Renderer + 'static,
Renderer::Theme: widget::button::StyleSheet,
<Renderer::Theme as widget::button::StyleSheet>::Variant:
Default + Copy,
{
type State = ();
type Event = Event;
@ -158,6 +162,9 @@ mod numeric_input {
where
Message: 'a,
Renderer: 'static + text::Renderer,
Renderer::Theme: widget::button::StyleSheet,
<Renderer::Theme as widget::button::StyleSheet>::Variant:
Default + Copy,
{
fn from(numeric_input: NumericInput<Message>) -> Self {
pure::component(numeric_input)

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

@ -9,6 +9,7 @@ use iced::pure::{
button, checkbox, column, container, pick_list, row, slider, text,
};
use iced::pure::{Application, Element};
use iced::theme::{self, Theme};
use iced::time;
use iced::window;
use iced::{Alignment, Color, Command, Length, Settings, Subscription};
@ -52,6 +53,7 @@ enum Message {
impl Application for GameOfLife {
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
@ -168,10 +170,13 @@ fn view_controls<'a>(
.spacing(10)
.push(
button(if is_playing { "Pause" } else { "Play" })
.on_press(Message::TogglePlayback)
.style(style::Button),
.on_press(Message::TogglePlayback),
)
.push(button("Next").on_press(Message::Next).style(style::Button));
.push(
button("Next")
.on_press(Message::Next)
.style(theme::Button::Secondary),
);
let speed_controls = row()
.width(Length::Fill)
@ -201,7 +206,11 @@ fn view_controls<'a>(
.text_size(16)
.style(style::PickList),
)
.push(button("Clear").on_press(Message::Clear).style(style::Clear))
.push(
button("Clear")
.on_press(Message::Clear)
.style(theme::Button::Destructive),
)
.into()
}

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

@ -1,4 +1,4 @@
use iced::{button, container, pick_list, slider, Background, Color};
use iced::{container, pick_list, slider, Color};
const ACTIVE: Color = Color::from_rgb(
0x72 as f32 / 255.0,
@ -6,12 +6,6 @@ const ACTIVE: Color = Color::from_rgb(
0xDA as f32 / 255.0,
);
const DESTRUCTIVE: Color = Color::from_rgb(
0xC0 as f32 / 255.0,
0x47 as f32 / 255.0,
0x47 as f32 / 255.0,
);
const HOVERED: Color = Color::from_rgb(
0x67 as f32 / 255.0,
0x7B as f32 / 255.0,
@ -35,67 +29,6 @@ impl container::StyleSheet for Container {
}
}
pub struct Button;
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(ACTIVE)),
border_radius: 3.0,
text_color: Color::WHITE,
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
background: Some(Background::Color(HOVERED)),
text_color: Color::WHITE,
..self.active()
}
}
fn pressed(&self) -> button::Style {
button::Style {
border_width: 1.0,
border_color: Color::WHITE,
..self.hovered()
}
}
}
pub struct Clear;
impl button::StyleSheet for Clear {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(DESTRUCTIVE)),
border_radius: 3.0,
text_color: Color::WHITE,
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
background: Some(Background::Color(Color {
a: 0.5,
..DESTRUCTIVE
})),
text_color: Color::WHITE,
..self.active()
}
}
fn pressed(&self) -> button::Style {
button::Style {
border_width: 1.0,
border_color: Color::WHITE,
..self.hovered()
}
}
}
pub struct Slider;
impl slider::StyleSheet for Slider {

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

@ -4,6 +4,7 @@ use iced::keyboard;
use iced::pure::widget::pane_grid::{self, PaneGrid};
use iced::pure::{button, column, container, row, scrollable, text};
use iced::pure::{Application, Element};
use iced::theme::{self, Theme};
use iced::{Color, Command, Length, Settings, Size, Subscription};
use iced_lazy::pure::responsive;
use iced_native::{event, subscription, Event};
@ -33,6 +34,7 @@ enum Message {
impl Application for Example {
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
@ -161,7 +163,6 @@ impl Application for Example {
text(if pane.is_pinned { "Unpin" } else { "Pin" }).size(14),
)
.on_press(Message::TogglePin(id))
.style(style::Button::Pin)
.padding(3);
let title = row()
@ -259,7 +260,7 @@ fn view_content<'a>(
is_pinned: bool,
size: Size,
) -> Element<'a, Message> {
let button = |label, message, style| {
let button = |label, message| {
button(
text(label)
.width(Length::Fill)
@ -269,7 +270,6 @@ fn view_content<'a>(
.width(Length::Fill)
.padding(8)
.on_press(message)
.style(style)
};
let mut controls = column()
@ -278,20 +278,17 @@ fn view_content<'a>(
.push(button(
"Split horizontally",
Message::Split(pane_grid::Axis::Horizontal, pane),
style::Button::Primary,
))
.push(button(
"Split vertically",
Message::Split(pane_grid::Axis::Vertical, pane),
style::Button::Primary,
));
if total_panes > 1 && !is_pinned {
controls = controls.push(button(
"Close",
Message::Close(pane),
style::Button::Destructive,
));
controls = controls.push(
button("Close", Message::Close(pane))
.style(theme::Button::Destructive),
);
}
let content = column()
@ -315,7 +312,7 @@ fn view_controls<'a>(
is_pinned: bool,
) -> Element<'a, Message> {
let mut button = button(text("Close").size(14))
.style(style::Button::Control)
.style(theme::Button::Destructive)
.padding(3);
if total_panes > 1 && !is_pinned {
@ -326,8 +323,7 @@ fn view_controls<'a>(
}
mod style {
use crate::PANE_ID_COLOR_FOCUSED;
use iced::{button, container, Background, Color, Vector};
use iced::{container, Background, Color};
const SURFACE: Color = Color::from_rgb(
0xF2 as f32 / 255.0,
@ -335,18 +331,6 @@ mod style {
0xF5 as f32 / 255.0,
);
const ACTIVE: Color = Color::from_rgb(
0x72 as f32 / 255.0,
0x89 as f32 / 255.0,
0xDA as f32 / 255.0,
);
const HOVERED: Color = Color::from_rgb(
0x67 as f32 / 255.0,
0x7B as f32 / 255.0,
0xC4 as f32 / 255.0,
);
pub enum TitleBar {
Active,
Focused,
@ -386,51 +370,4 @@ mod style {
}
}
}
pub enum Button {
Primary,
Destructive,
Control,
Pin,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
let (background, text_color) = match self {
Button::Primary => (Some(ACTIVE), Color::WHITE),
Button::Destructive => {
(None, Color::from_rgb8(0xFF, 0x47, 0x47))
}
Button::Control => (Some(PANE_ID_COLOR_FOCUSED), Color::WHITE),
Button::Pin => (Some(ACTIVE), Color::WHITE),
};
button::Style {
text_color,
background: background.map(Background::Color),
border_radius: 5.0,
shadow_offset: Vector::new(0.0, 0.0),
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
let active = self.active();
let background = match self {
Button::Primary => Some(HOVERED),
Button::Destructive => Some(Color {
a: 0.2,
..active.text_color
}),
Button::Control => Some(PANE_ID_COLOR_FOCUSED),
Button::Pin => Some(HOVERED),
};
button::Style {
background: background.map(Background::Color),
..active
}
}
}
}

66
examples/pure/todos/src/main.rs
View file

@ -4,6 +4,7 @@ use iced::pure::{
button, checkbox, column, container, row, scrollable, text, text_input,
Application, Element,
};
use iced::theme::{self, Theme};
use iced::window;
use iced::{Command, Font, Length, Settings};
use serde::{Deserialize, Serialize};
@ -44,8 +45,9 @@ enum Message {
}
impl Application for Todos {
type Executor = iced::executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = iced::executor::Default;
type Flags = ();
fn new(_flags: ()) -> (Todos, Command<Message>) {
@ -287,7 +289,7 @@ impl Task {
button(edit_icon())
.on_press(TaskMessage::Edit)
.padding(10)
.style(style::Button::Icon),
.style(theme::Button::Text),
)
.into()
}
@ -313,7 +315,7 @@ impl Task {
)
.on_press(TaskMessage::Delete)
.padding(10)
.style(style::Button::Destructive),
.style(theme::Button::Destructive),
)
.into()
}
@ -328,9 +330,9 @@ fn view_controls(tasks: &[Task], current_filter: Filter) -> Element<Message> {
let label = text(label).size(16);
let button = button(label).style(if filter == current_filter {
style::Button::FilterSelected
theme::Button::Primary
} else {
style::Button::FilterActive
theme::Button::Text
});
button.on_press(Message::FilterChanged(filter)).padding(8)
@ -552,57 +554,3 @@ impl SavedState {
Ok(())
}
}
mod style {
use iced::{button, Background, Color, Vector};
pub enum Button {
FilterActive,
FilterSelected,
Icon,
Destructive,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
match self {
Button::FilterActive => button::Style::default(),
Button::FilterSelected => button::Style {
background: Some(Background::Color(Color::from_rgb(
0.2, 0.2, 0.7,
))),
border_radius: 10.0,
text_color: Color::WHITE,
..button::Style::default()
},
Button::Icon => button::Style {
text_color: Color::from_rgb(0.5, 0.5, 0.5),
..button::Style::default()
},
Button::Destructive => button::Style {
background: Some(Background::Color(Color::from_rgb(
0.8, 0.2, 0.2,
))),
border_radius: 5.0,
text_color: Color::WHITE,
shadow_offset: Vector::new(1.0, 1.0),
..button::Style::default()
},
}
}
fn hovered(&self) -> button::Style {
let active = self.active();
button::Style {
text_color: match self {
Button::Icon => Color::from_rgb(0.2, 0.2, 0.7),
Button::FilterActive => Color::from_rgb(0.2, 0.2, 0.7),
_ => active.text_color,
},
shadow_offset: active.shadow_offset + Vector::new(0.0, 1.0),
..active
}
}
}
}

37
examples/pure/tour/src/main.rs
View file

@ -5,6 +5,7 @@ use iced::pure::{
scrollable, slider, text, text_input, toggler, vertical_space,
};
use iced::pure::{Element, Sandbox};
use iced::theme;
use iced::{Color, Length, Settings};
pub fn main() -> iced::Result {
@ -55,7 +56,7 @@ impl Sandbox for Tour {
controls = controls.push(
button("Back")
.on_press(Message::BackPressed)
.style(style::Button::Secondary),
.style(theme::Button::Secondary),
);
}
@ -65,7 +66,7 @@ impl Sandbox for Tour {
controls = controls.push(
button("Next")
.on_press(Message::NextPressed)
.style(style::Button::Primary),
.style(theme::Button::Primary),
);
}
@ -669,35 +670,3 @@ pub enum Layout {
Row,
Column,
}
mod style {
use iced::{button, Background, Color, Vector};
pub enum Button {
Primary,
Secondary,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(match self {
Button::Primary => Color::from_rgb(0.11, 0.42, 0.87),
Button::Secondary => Color::from_rgb(0.5, 0.5, 0.5),
})),
border_radius: 12.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::from_rgb8(0xEE, 0xEE, 0xEE),
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
text_color: Color::WHITE,
shadow_offset: Vector::new(1.0, 2.0),
..self.active()
}
}
}
}

12
examples/solar_system/src/main.rs
View file

@ -6,10 +6,13 @@
//! Inspired by the example found in the MDN docs[1].
//!
//! [1]: https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API/Tutorial/Basic_animations#An_animated_solar_system
use iced::canvas::{self, Cursor, Path, Stroke};
use iced::executor;
use iced::time;
use iced::window;
use iced::{
canvas::{self, Cursor, Path, Stroke},
executor, time, window, Application, Canvas, Color, Command, Element,
Length, Point, Rectangle, Settings, Size, Subscription, Vector,
Application, Canvas, Color, Command, Element, Length, Point, Rectangle,
Settings, Size, Subscription, Theme, Vector,
};
use std::time::Instant;
@ -31,8 +34,9 @@ enum Message {
}
impl Application for SolarSystem {
type Executor = executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
fn new(_flags: ()) -> (Self, Command<Message>) {

56
examples/stopwatch/src/main.rs
View file

@ -1,7 +1,13 @@
use iced::alignment;
use iced::button;
use iced::executor;
use iced::theme::{self, Theme};
use iced::time;
use iced::{
alignment, button, executor, time, Alignment, Application, Button, Column,
Command, Container, Element, Length, Row, Settings, Subscription, Text,
Alignment, Application, Button, Column, Command, Container, Element,
Length, Row, Settings, Subscription, Text,
};
use std::time::{Duration, Instant};
pub fn main() -> iced::Result {
@ -28,8 +34,9 @@ enum Message {
}
impl Application for Stopwatch {
type Executor = executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
fn new(_flags: ()) -> (Stopwatch, Command<Message>) {
@ -99,7 +106,7 @@ impl Application for Stopwatch {
))
.size(40);
let button = |state, label, style| {
let button = |state, label| {
Button::new(
state,
Text::new(label)
@ -107,21 +114,20 @@ impl Application for Stopwatch {
)
.padding(10)
.width(Length::Units(80))
.style(style)
};
let toggle_button = {
let (label, color) = match self.state {
State::Idle => ("Start", style::Button::Primary),
State::Ticking { .. } => ("Stop", style::Button::Destructive),
let label = match self.state {
State::Idle => "Start",
State::Ticking { .. } => "Stop",
};
button(&mut self.toggle, label, color).on_press(Message::Toggle)
button(&mut self.toggle, label).on_press(Message::Toggle)
};
let reset_button =
button(&mut self.reset, "Reset", style::Button::Secondary)
.on_press(Message::Reset);
let reset_button = button(&mut self.reset, "Reset")
.style(theme::Button::Destructive)
.on_press(Message::Reset);
let controls = Row::new()
.spacing(20)
@ -142,29 +148,3 @@ impl Application for Stopwatch {
.into()
}
}
mod style {
use iced::{button, Background, Color, Vector};
pub enum Button {
Primary,
Secondary,
Destructive,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(match self {
Button::Primary => Color::from_rgb(0.11, 0.42, 0.87),
Button::Secondary => Color::from_rgb(0.5, 0.5, 0.5),
Button::Destructive => Color::from_rgb(0.8, 0.2, 0.2),
})),
border_radius: 12.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::WHITE,
..button::Style::default()
}
}
}
}

85
examples/styling/src/main.rs
View file

@ -1,7 +1,11 @@
use iced::button;
use iced::scrollable;
use iced::slider;
use iced::text_input;
use iced::{
button, scrollable, slider, text_input, Alignment, Button, Checkbox,
Column, Container, Element, Length, ProgressBar, Radio, Row, Rule, Sandbox,
Scrollable, Settings, Slider, Space, Text, TextInput, Toggler,
Alignment, Button, Checkbox, Column, Container, Element, Length,
ProgressBar, Radio, Row, Rule, Sandbox, Scrollable, Settings, Slider,
Space, Text, TextInput, Toggler,
};
pub fn main() -> iced::Result {
@ -81,8 +85,7 @@ impl Sandbox for Styling {
let button = Button::new(&mut self.button, Text::new("Submit"))
.padding(10)
.on_press(Message::ButtonPressed)
.style(self.theme);
.on_press(Message::ButtonPressed);
let slider = Slider::new(
&mut self.slider,
@ -156,8 +159,8 @@ impl Sandbox for Styling {
mod style {
use iced::{
button, checkbox, container, progress_bar, radio, rule, scrollable,
slider, text_input, toggler,
checkbox, container, progress_bar, radio, rule, scrollable, slider,
text_input, toggler,
};
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@ -203,15 +206,6 @@ mod style {
}
}
impl<'a> From<Theme> for Box<dyn button::StyleSheet + 'a> {
fn from(theme: Theme) -> Self {
match theme {
Theme::Light => light::Button.into(),
Theme::Dark => dark::Button.into(),
}
}
}
impl<'a> From<Theme> for Box<dyn scrollable::StyleSheet + 'a> {
fn from(theme: Theme) -> Self {
match theme {
@ -266,36 +260,10 @@ mod style {
}
}
mod light {
use iced::{button, Color, Vector};
pub struct Button;
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: Color::from_rgb(0.11, 0.42, 0.87).into(),
border_radius: 12.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::from_rgb8(0xEE, 0xEE, 0xEE),
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
text_color: Color::WHITE,
shadow_offset: Vector::new(1.0, 2.0),
..self.active()
}
}
}
}
mod dark {
use iced::{
button, checkbox, container, progress_bar, radio, rule, scrollable,
slider, text_input, toggler, Color,
checkbox, container, progress_bar, radio, rule, scrollable, slider,
text_input, toggler, Color,
};
const SURFACE: Color = Color::from_rgb(
@ -396,35 +364,6 @@ mod style {
}
}
pub struct Button;
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: ACTIVE.into(),
border_radius: 3.0,
text_color: Color::WHITE,
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
background: HOVERED.into(),
text_color: Color::WHITE,
..self.active()
}
}
fn pressed(&self) -> button::Style {
button::Style {
border_width: 1.0,
border_color: Color::WHITE,
..self.hovered()
}
}
}
pub struct Scrollable;
impl scrollable::StyleSheet for Scrollable {

3
examples/system_information/src/main.rs
View file

@ -1,6 +1,6 @@
use iced::{
button, executor, system, Application, Button, Column, Command, Container,
Element, Length, Settings, Text,
Element, Length, Settings, Text, Theme,
};
use bytesize::ByteSize;
@ -25,6 +25,7 @@ enum Message {
impl Application for Example {
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();

64
examples/todos/src/main.rs
View file

@ -2,6 +2,7 @@ use iced::alignment::{self, Alignment};
use iced::button::{self, Button};
use iced::scrollable::{self, Scrollable};
use iced::text_input::{self, TextInput};
use iced::theme::{self, Theme};
use iced::{
Application, Checkbox, Column, Command, Container, Element, Font, Length,
Row, Settings, Text,
@ -42,6 +43,7 @@ enum Message {
impl Application for Todos {
type Executor = iced::executor::Default;
type Theme = Theme;
type Message = Message;
type Flags = ();
@ -304,7 +306,7 @@ impl Task {
Button::new(edit_button, edit_icon())
.on_press(TaskMessage::Edit)
.padding(10)
.style(style::Button::Icon),
.style(theme::Button::Text),
)
.into()
}
@ -335,7 +337,7 @@ impl Task {
)
.on_press(TaskMessage::Delete)
.padding(10)
.style(style::Button::Destructive),
.style(theme::Button::Destructive),
)
.into()
}
@ -364,9 +366,9 @@ impl Controls {
let label = Text::new(label).size(16);
let button =
Button::new(state, label).style(if filter == current_filter {
style::Button::FilterSelected
theme::Button::Primary
} else {
style::Button::FilterActive
theme::Button::Text
});
button.on_press(Message::FilterChanged(filter)).padding(8)
@ -599,57 +601,3 @@ impl SavedState {
Ok(())
}
}
mod style {
use iced::{button, Background, Color, Vector};
pub enum Button {
FilterActive,
FilterSelected,
Icon,
Destructive,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
match self {
Button::FilterActive => button::Style::default(),
Button::FilterSelected => button::Style {
background: Some(Background::Color(Color::from_rgb(
0.2, 0.2, 0.7,
))),
border_radius: 10.0,
text_color: Color::WHITE,
..button::Style::default()
},
Button::Icon => button::Style {
text_color: Color::from_rgb(0.5, 0.5, 0.5),
..button::Style::default()
},
Button::Destructive => button::Style {
background: Some(Background::Color(Color::from_rgb(
0.8, 0.2, 0.2,
))),
border_radius: 5.0,
text_color: Color::WHITE,
shadow_offset: Vector::new(1.0, 1.0),
..button::Style::default()
},
}
}
fn hovered(&self) -> button::Style {
let active = self.active();
button::Style {
text_color: match self {
Button::Icon => Color::from_rgb(0.2, 0.2, 0.7),
Button::FilterActive => Color::from_rgb(0.2, 0.2, 0.7),
_ => active.text_color,
},
shadow_offset: active.shadow_offset + Vector::new(0.0, 1.0),
..active
}
}
}
}

49
examples/tour/src/main.rs
View file

@ -1,7 +1,13 @@
use iced::alignment;
use iced::button;
use iced::scrollable;
use iced::slider;
use iced::text_input;
use iced::theme;
use iced::{
alignment, button, scrollable, slider, text_input, Button, Checkbox, Color,
Column, Container, ContentFit, Element, Image, Length, Radio, Row, Sandbox,
Scrollable, Settings, Slider, Space, Text, TextInput, Toggler,
Button, Checkbox, Color, Column, Container, ContentFit, Element, Image,
Length, Radio, Row, Sandbox, Scrollable, Settings, Slider, Space, Text,
TextInput, Toggler,
};
pub fn main() -> iced::Result {
@ -64,7 +70,7 @@ impl Sandbox for Tour {
controls = controls.push(
button(back_button, "Back")
.on_press(Message::BackPressed)
.style(style::Button::Secondary),
.style(theme::Button::Secondary),
);
}
@ -74,7 +80,7 @@ impl Sandbox for Tour {
controls = controls.push(
button(next_button, "Next")
.on_press(Message::NextPressed)
.style(style::Button::Primary),
.style(theme::Button::Primary),
);
}
@ -818,36 +824,3 @@ pub enum Layout {
Row,
Column,
}
mod style {
use iced::button;
use iced::{Background, Color, Vector};
pub enum Button {
Primary,
Secondary,
}
impl button::StyleSheet for Button {
fn active(&self) -> button::Style {
button::Style {
background: Some(Background::Color(match self {
Button::Primary => Color::from_rgb(0.11, 0.42, 0.87),
Button::Secondary => Color::from_rgb(0.5, 0.5, 0.5),
})),
border_radius: 12.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::from_rgb8(0xEE, 0xEE, 0xEE),
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
text_color: Color::WHITE,
shadow_offset: Vector::new(1.0, 2.0),
..self.active()
}
}
}
}

8
examples/url_handler/src/main.rs
View file

@ -1,6 +1,7 @@
use iced::executor;
use iced::{
executor, Application, Command, Container, Element, Length, Settings,
Subscription, Text,
Application, Command, Container, Element, Length, Settings, Subscription,
Text, Theme,
};
use iced_native::{
event::{MacOS, PlatformSpecific},
@ -22,8 +23,9 @@ enum Message {
}
impl Application for App {
type Executor = executor::Default;
type Message = Message;
type Theme = Theme;
type Executor = executor::Default;
type Flags = ();
fn new(_flags: ()) -> (App, Command<Message>) {

3
examples/websocket/src/main.rs
View file

@ -7,7 +7,7 @@ use iced::scrollable::{self, Scrollable};
use iced::text_input::{self, TextInput};
use iced::{
Application, Color, Column, Command, Container, Element, Length, Row,
Settings, Subscription, Text,
Settings, Subscription, Text, Theme,
};
pub fn main() -> iced::Result {
@ -34,6 +34,7 @@ enum Message {
impl Application for WebSocket {
type Message = Message;
type Theme = Theme;
type Flags = ();
type Executor = executor::Default;

4
glow/src/lib.rs
View file

@ -30,6 +30,7 @@ pub use settings::Settings;
pub(crate) use iced_graphics::Transformation;
pub use iced_graphics::{Error, Viewport};
pub use iced_native::Theme;
pub use iced_native::alignment;
pub use iced_native::{Alignment, Background, Color, Command, Length, Vector};
@ -38,4 +39,5 @@ pub use iced_native::{Alignment, Background, Color, Command, Length, Vector};
///
/// [`glow`]: https://github.com/grovesNL/glow
/// [`iced`]: https://github.com/iced-rs/iced
pub type Renderer = iced_graphics::Renderer<Backend>;
pub type Renderer<Theme = iced_native::Theme> =
iced_graphics::Renderer<Backend, Theme>;

19
glow/src/window/compositor.rs
View file

@ -1,18 +1,21 @@
use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
use core::ffi::c_void;
use glow::HasContext;
use iced_graphics::{compositor, Antialiasing, Size};
use core::ffi::c_void;
use std::marker::PhantomData;
/// A window graphics backend for iced powered by `glow`.
#[allow(missing_debug_implementations)]
pub struct Compositor {
pub struct Compositor<Theme> {
gl: glow::Context,
theme: PhantomData<Theme>,
}
impl iced_graphics::window::GLCompositor for Compositor {
impl<Theme> iced_graphics::window::GLCompositor for Compositor<Theme> {
type Settings = Settings;
type Renderer = Renderer;
type Renderer = Renderer<Theme>;
unsafe fn new(
settings: Self::Settings,
@ -46,7 +49,13 @@ impl iced_graphics::window::GLCompositor for Compositor {
let renderer = Renderer::new(Backend::new(&gl, settings));
Ok((Self { gl }, renderer))
Ok((
Self {
gl,
theme: PhantomData,
},
renderer,
))
}
fn sample_count(settings: &Settings) -> u32 {

16
glutin/src/application.rs
View file

@ -209,6 +209,8 @@ async fn run_instance<A, E, C>(
let mut state = application::State::new(&application, context.window());
let mut viewport_version = state.viewport_version();
let theme = application.theme();
let mut user_interface =
ManuallyDrop::new(application::build_user_interface(
&mut application,
@ -288,8 +290,11 @@ async fn run_instance<A, E, C>(
}
debug.draw_started();
let new_mouse_interaction =
user_interface.draw(&mut renderer, state.cursor_position());
let new_mouse_interaction = user_interface.draw(
&mut renderer,
&theme,
state.cursor_position(),
);
debug.draw_finished();
if new_mouse_interaction != mouse_interaction {
@ -341,8 +346,11 @@ async fn run_instance<A, E, C>(
debug.layout_finished();
debug.draw_started();
let new_mouse_interaction = user_interface
.draw(&mut renderer, state.cursor_position());
let new_mouse_interaction = user_interface.draw(
&mut renderer,
&theme,
state.cursor_position(),
);
debug.draw_finished();
if new_mouse_interaction != mouse_interaction {

18
graphics/src/renderer.rs
View file

@ -10,19 +10,23 @@ use iced_native::{Background, Element, Font, Point, Rectangle, Size};
pub use iced_native::renderer::Style;
use std::marker::PhantomData;
/// A backend-agnostic renderer that supports all the built-in widgets.
#[derive(Debug)]
pub struct Renderer<B: Backend> {
pub struct Renderer<B: Backend, Theme> {
backend: B,
primitives: Vec<Primitive>,
theme: PhantomData<Theme>,
}
impl<B: Backend> Renderer<B> {
impl<B: Backend, T> Renderer<B, T> {
/// Creates a new [`Renderer`] from the given [`Backend`].
pub fn new(backend: B) -> Self {
Self {
backend,
primitives: Vec::new(),
theme: PhantomData,
}
}
@ -43,10 +47,12 @@ impl<B: Backend> Renderer<B> {
}
}
impl<B> iced_native::Renderer for Renderer<B>
impl<B, T> iced_native::Renderer for Renderer<B, T>
where
B: Backend,
{
type Theme = T;
fn layout<'a, Message>(
&mut self,
element: &Element<'a, Message, Self>,
@ -114,7 +120,7 @@ where
}
}
impl<B> text::Renderer for Renderer<B>
impl<B, T> text::Renderer for Renderer<B, T>
where
B: Backend + backend::Text,
{
@ -171,7 +177,7 @@ where
}
}
impl<B> image::Renderer for Renderer<B>
impl<B, T> image::Renderer for Renderer<B, T>
where
B: Backend + backend::Image,
{
@ -186,7 +192,7 @@ where
}
}
impl<B> svg::Renderer for Renderer<B>
impl<B, T> svg::Renderer for Renderer<B, T>
where
B: Backend + backend::Svg,
{

19
graphics/src/widget/canvas.rs
View file

@ -127,7 +127,7 @@ impl<Message, P: Program<Message>> Canvas<Message, P> {
}
}
impl<Message, P, B> Widget<Message, Renderer<B>> for Canvas<Message, P>
impl<Message, P, B, T> Widget<Message, Renderer<B, T>> for Canvas<Message, P>
where
P: Program<Message>,
B: Backend,
@ -142,7 +142,7 @@ where
fn layout(
&self,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
limits: &layout::Limits,
) -> layout::Node {
let limits = limits.width(self.width).height(self.height);
@ -156,7 +156,7 @@ where
event: iced_native::Event,
layout: Layout<'_>,
cursor_position: Point,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
_clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
) -> event::Status {
@ -193,7 +193,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
) -> mouse::Interaction {
let bounds = layout.bounds();
let cursor = Cursor::from_window_position(cursor_position);
@ -203,7 +203,8 @@ where
fn draw(
&self,
renderer: &mut Renderer<B>,
renderer: &mut Renderer<B, T>,
_theme: &T,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -233,14 +234,16 @@ where
}
}
impl<'a, Message, P, B> From<Canvas<Message, P>>
for Element<'a, Message, Renderer<B>>
impl<'a, Message, P, B, T> From<Canvas<Message, P>>
for Element<'a, Message, Renderer<B, T>>
where
Message: 'static,
P: Program<Message> + 'a,
B: Backend,
{
fn from(canvas: Canvas<Message, P>) -> Element<'a, Message, Renderer<B>> {
fn from(
canvas: Canvas<Message, P>,
) -> Element<'a, Message, Renderer<B, T>> {
Element::new(canvas)
}
}

19
graphics/src/widget/pure/canvas.rs
View file

@ -103,7 +103,7 @@ where
}
}
impl<Message, P, B> Widget<Message, Renderer<B>> for Canvas<Message, P>
impl<Message, P, B, T> Widget<Message, Renderer<B, T>> for Canvas<Message, P>
where
P: Program<Message>,
B: Backend,
@ -126,7 +126,7 @@ where
fn layout(
&self,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
limits: &layout::Limits,
) -> layout::Node {
let limits = limits.width(self.width).height(self.height);
@ -141,7 +141,7 @@ where
event: iced_native::Event,
layout: Layout<'_>,
cursor_position: Point,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
_clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
) -> event::Status {
@ -181,7 +181,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
) -> mouse::Interaction {
let bounds = layout.bounds();
let cursor = Cursor::from_window_position(cursor_position);
@ -193,7 +193,8 @@ where
fn draw(
&self,
tree: &Tree,
renderer: &mut Renderer<B>,
renderer: &mut Renderer<B, T>,
_theme: &T,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -224,14 +225,16 @@ where
}
}
impl<'a, Message, P, B> From<Canvas<Message, P>>
for Element<'a, Message, Renderer<B>>
impl<'a, Message, P, B, T> From<Canvas<Message, P>>
for Element<'a, Message, Renderer<B, T>>
where
Message: 'a,
P: Program<Message> + 'a,
B: Backend,
{
fn from(canvas: Canvas<Message, P>) -> Element<'a, Message, Renderer<B>> {
fn from(
canvas: Canvas<Message, P>,
) -> Element<'a, Message, Renderer<B, T>> {
Element::new(canvas)
}
}

21
graphics/src/widget/pure/qr_code.rs
View file

@ -9,24 +9,24 @@ use iced_native::{Length, Point, Rectangle};
use iced_pure::widget::tree::Tree;
use iced_pure::{Element, Widget};
impl<'a, Message, B> Widget<Message, Renderer<B>> for QRCode<'a>
impl<'a, Message, B, T> Widget<Message, Renderer<B, T>> for QRCode<'a>
where
B: Backend,
{
fn width(&self) -> Length {
<Self as iced_native::Widget<Message, Renderer<B>>>::width(self)
<Self as iced_native::Widget<Message, Renderer<B, T>>>::width(self)
}
fn height(&self) -> Length {
<Self as iced_native::Widget<Message, Renderer<B>>>::height(self)
<Self as iced_native::Widget<Message, Renderer<B, T>>>::height(self)
}
fn layout(
&self,
renderer: &Renderer<B>,
renderer: &Renderer<B, T>,
limits: &layout::Limits,
) -> layout::Node {
<Self as iced_native::Widget<Message, Renderer<B>>>::layout(
<Self as iced_native::Widget<Message, Renderer<B, T>>>::layout(
self, renderer, limits,
)
}
@ -34,15 +34,17 @@ where
fn draw(
&self,
_tree: &Tree,
renderer: &mut Renderer<B>,
renderer: &mut Renderer<B, T>,
theme: &T,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) {
<Self as iced_native::Widget<Message, Renderer<B>>>::draw(
<Self as iced_native::Widget<Message, Renderer<B, T>>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,
@ -51,11 +53,12 @@ where
}
}
impl<'a, Message, B> Into<Element<'a, Message, Renderer<B>>> for QRCode<'a>
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>>
for QRCode<'a>
where
B: Backend,
{
fn into(self) -> Element<'a, Message, Renderer<B>> {
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
Element::new(self)
}
}

12
graphics/src/widget/qr_code.rs
View file

@ -47,7 +47,7 @@ impl<'a> QRCode<'a> {
}
}
impl<'a, Message, B> Widget<Message, Renderer<B>> for QRCode<'a>
impl<'a, Message, B, T> Widget<Message, Renderer<B, T>> for QRCode<'a>
where
B: Backend,
{
@ -61,7 +61,7 @@ where
fn layout(
&self,
_renderer: &Renderer<B>,
_renderer: &Renderer<B, T>,
_limits: &layout::Limits,
) -> layout::Node {
let side_length = (self.state.width + 2 * QUIET_ZONE) as f32
@ -75,7 +75,8 @@ where
fn draw(
&self,
renderer: &mut Renderer<B>,
renderer: &mut Renderer<B, T>,
_theme: &T,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,
@ -127,11 +128,12 @@ where
}
}
impl<'a, Message, B> Into<Element<'a, Message, Renderer<B>>> for QRCode<'a>
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>>
for QRCode<'a>
where
B: Backend,
{
fn into(self) -> Element<'a, Message, Renderer<B>> {
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
Element::new(self)
}
}

13
lazy/src/component.rs
View file

@ -206,13 +206,21 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) {
self.with_element(|element| {
element.draw(renderer, style, layout, cursor_position, viewport);
element.draw(
renderer,
theme,
style,
layout,
cursor_position,
viewport,
);
});
}
@ -337,12 +345,13 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
) {
self.with_overlay_maybe(|overlay| {
overlay.draw(renderer, style, layout, cursor_position);
overlay.draw(renderer, theme, style, layout, cursor_position);
});
}

5
lazy/src/pure/component.rs
View file

@ -233,6 +233,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -242,6 +243,7 @@ where
element.as_widget().draw(
&tree.children[0],
renderer,
theme,
style,
layout,
cursor_position,
@ -376,12 +378,13 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
) {
self.with_overlay_maybe(|overlay| {
overlay.draw(renderer, style, layout, cursor_position);
overlay.draw(renderer, theme, style, layout, cursor_position);
});
}

10
lazy/src/pure/responsive.rs
View file

@ -53,7 +53,10 @@ struct Content<'a, Message, Renderer> {
element: Element<'a, Message, Renderer>,
}
impl<'a, Message, Renderer> Content<'a, Message, Renderer> {
impl<'a, Message, Renderer> Content<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
{
fn update(
&mut self,
tree: &mut Tree,
@ -174,6 +177,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -191,6 +195,7 @@ where
element.as_widget().draw(
tree,
renderer,
theme,
style,
layout,
cursor_position,
@ -331,12 +336,13 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
) {
self.with_overlay_maybe(|overlay| {
overlay.draw(renderer, style, layout, cursor_position);
overlay.draw(renderer, theme, style, layout, cursor_position);
});
}

5
lazy/src/responsive.rs
View file

@ -119,6 +119,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -129,6 +130,7 @@ where
internal.resolve(renderer, |state, renderer, content| {
content.draw(
renderer,
theme,
style,
state.layout(layout),
cursor_position,
@ -356,12 +358,13 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
) {
self.with_overlay_maybe(|overlay| {
overlay.draw(renderer, style, layout, cursor_position);
overlay.draw(renderer, theme, style, layout, cursor_position);
});
}

24
native/src/element.rs
View file

@ -244,13 +244,20 @@ where
pub fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) {
self.widget
.draw(renderer, style, layout, cursor_position, viewport)
self.widget.draw(
renderer,
theme,
style,
layout,
cursor_position,
viewport,
)
}
/// Returns the current [`mouse::Interaction`] of the [`Element`].
@ -350,13 +357,20 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) {
self.widget
.draw(renderer, style, layout, cursor_position, viewport)
self.widget.draw(
renderer,
theme,
style,
layout,
cursor_position,
viewport,
)
}
fn mouse_interaction(
@ -444,6 +458,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -471,6 +486,7 @@ where
self.element.widget.draw(
renderer,
theme,
style,
layout,
cursor_position,

2
native/src/lib.rs
View file

@ -76,6 +76,7 @@ pub use iced_core::{
Rectangle, Size, Vector,
};
pub use iced_futures::{executor, futures};
pub use iced_style::theme;
#[doc(no_inline)]
pub use executor::Executor;
@ -93,5 +94,6 @@ pub use renderer::Renderer;
pub use runtime::Runtime;
pub use shell::Shell;
pub use subscription::Subscription;
pub use theme::Theme;
pub use user_interface::UserInterface;
pub use widget::Widget;

1
native/src/overlay.rs
View file

@ -34,6 +34,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

8
native/src/overlay/element.rs
View file

@ -94,11 +94,13 @@ where
pub fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
) {
self.overlay.draw(renderer, style, layout, cursor_position)
self.overlay
.draw(renderer, theme, style, layout, cursor_position)
}
}
@ -173,10 +175,12 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
) {
self.content.draw(renderer, style, layout, cursor_position)
self.content
.draw(renderer, theme, style, layout, cursor_position)
}
}

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

@ -241,6 +241,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -257,8 +258,14 @@ where
self.style.background,
);
self.container
.draw(renderer, style, layout, cursor_position, &bounds);
self.container.draw(
renderer,
theme,
style,
layout,
cursor_position,
&bounds,
);
}
}
@ -389,6 +396,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

5
native/src/program/state.rs
View file

@ -86,6 +86,7 @@ where
bounds: Size,
cursor_position: Point,
renderer: &mut P::Renderer,
theme: &<P::Renderer as crate::Renderer>::Theme,
clipboard: &mut dyn Clipboard,
debug: &mut Debug,
) -> Option<Command<P::Message>> {
@ -115,7 +116,7 @@ where
if messages.is_empty() {
debug.draw_started();
self.mouse_interaction =
user_interface.draw(renderer, cursor_position);
user_interface.draw(renderer, theme, cursor_position);
debug.draw_finished();
self.cache = Some(user_interface.into_cache());
@ -147,7 +148,7 @@ where
debug.draw_started();
self.mouse_interaction =
user_interface.draw(renderer, cursor_position);
user_interface.draw(renderer, theme, cursor_position);
debug.draw_finished();
self.cache = Some(user_interface.into_cache());

3
native/src/renderer.rs
View file

@ -9,6 +9,9 @@ use crate::{Background, Color, Element, Rectangle, Vector};
/// A component that can be used by widgets to draw themselves on a screen.
pub trait Renderer: Sized {
/// The supported theme of the [`Renderer`].
type Theme;
/// Lays out the elements of a user interface.
///
/// You should override this if you need to perform any operations before or

4
native/src/renderer/null.rs
View file

@ -1,6 +1,6 @@
use crate::renderer::{self, Renderer};
use crate::text::{self, Text};
use crate::{Background, Font, Point, Rectangle, Size, Vector};
use crate::{Background, Font, Point, Rectangle, Size, Theme, Vector};
/// A renderer that does nothing.
///
@ -16,6 +16,8 @@ impl Null {
}
impl Renderer for Null {
type Theme = Theme;
fn with_layer(&mut self, _bounds: Rectangle, _f: impl FnOnce(&mut Self)) {}
fn with_translation(

7
native/src/user_interface.rs
View file

@ -274,7 +274,7 @@ where
/// [completing the last example](#example-1):
///
/// ```no_run
/// use iced_native::{clipboard, Size, Point};
/// use iced_native::{clipboard, Size, Point, Theme};
/// use iced_native::user_interface::{self, UserInterface};
/// use iced_wgpu::Renderer;
///
@ -322,7 +322,7 @@ where
/// );
///
/// // Draw the user interface
/// let mouse_cursor = user_interface.draw(&mut renderer, cursor_position);
/// let mouse_cursor = user_interface.draw(&mut renderer, &Theme::default(), cursor_position);
///
/// cache = user_interface.into_cache();
///
@ -337,6 +337,7 @@ where
pub fn draw(
&mut self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
cursor_position: Point,
) -> mouse::Interaction {
// TODO: Move to shell level (?)
@ -368,6 +369,7 @@ where
self.root.widget.draw(
renderer,
theme,
&renderer::Style::default(),
Layout::new(&self.base),
base_cursor,
@ -409,6 +411,7 @@ where
renderer.with_layer(overlay_bounds, |renderer| {
overlay.draw(
renderer,
theme,
&renderer::Style::default(),
Layout::new(layout),
cursor_position,

1
native/src/widget.rs
View file

@ -125,6 +125,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

40
native/src/widget/button.rs
View file

@ -55,20 +55,26 @@ pub use iced_style::button::{Style, StyleSheet};
/// }
/// ```
#[allow(missing_debug_implementations)]
pub struct Button<'a, Message, Renderer> {
pub struct Button<'a, Message, Renderer>
where
Renderer: crate::Renderer,
Renderer::Theme: StyleSheet,
{
state: &'a mut State,
content: Element<'a, Message, Renderer>,
on_press: Option<Message>,
width: Length,
height: Length,
padding: Padding,
style_sheet: Box<dyn StyleSheet + 'a>,
variant: <Renderer::Theme as StyleSheet>::Variant,
}
impl<'a, Message, Renderer> Button<'a, Message, Renderer>
where
Message: Clone,
Renderer: crate::Renderer,
Renderer::Theme: StyleSheet,
<Renderer::Theme as StyleSheet>::Variant: Default,
{
/// Creates a new [`Button`] with some local [`State`] and the given
/// content.
@ -83,7 +89,7 @@ where
width: Length::Shrink,
height: Length::Shrink,
padding: Padding::new(5),
style_sheet: Default::default(),
variant: <Renderer::Theme as StyleSheet>::Variant::default(),
}
}
@ -112,12 +118,12 @@ where
self
}
/// Sets the style of the [`Button`].
/// Sets the style variant of this [`Button`].
pub fn style(
mut self,
style_sheet: impl Into<Box<dyn StyleSheet + 'a>>,
variant: <Renderer::Theme as StyleSheet>::Variant,
) -> Self {
self.style_sheet = style_sheet.into();
self.variant = variant;
self
}
}
@ -190,28 +196,29 @@ pub fn update<'a, Message: Clone>(
}
/// Draws a [`Button`].
pub fn draw<'a, Renderer: crate::Renderer>(
pub fn draw<'a, Renderer: crate::Renderer, Variant>(
renderer: &mut Renderer,
bounds: Rectangle,
cursor_position: Point,
is_enabled: bool,
style_sheet: &dyn StyleSheet,
style_sheet: &dyn StyleSheet<Variant = Variant>,
variation: Variant,
state: impl FnOnce() -> &'a State,
) -> Style {
let is_mouse_over = bounds.contains(cursor_position);
let styling = if !is_enabled {
style_sheet.disabled()
style_sheet.disabled(variation)
} else if is_mouse_over {
let state = state();
if state.is_pressed {
style_sheet.pressed()
style_sheet.pressed(variation)
} else {
style_sheet.hovered()
style_sheet.hovered(variation)
}
} else {
style_sheet.active()
style_sheet.active(variation)
};
if styling.background.is_some() || styling.border_width > 0.0 {
@ -287,6 +294,8 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
where
Message: Clone,
Renderer: crate::Renderer,
Renderer::Theme: StyleSheet,
<Renderer::Theme as StyleSheet>::Variant: Copy,
{
fn width(&self) -> Length {
self.width
@ -354,6 +363,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -367,12 +377,14 @@ where
bounds,
cursor_position,
self.on_press.is_some(),
self.style_sheet.as_ref(),
theme,
self.variant,
|| &self.state,
);
self.content.draw(
renderer,
theme,
&renderer::Style {
text_color: styling.text_color,
},
@ -397,6 +409,8 @@ impl<'a, Message, Renderer> From<Button<'a, Message, Renderer>>
where
Message: 'a + Clone,
Renderer: 'a + crate::Renderer,
Renderer::Theme: StyleSheet,
<Renderer::Theme as StyleSheet>::Variant: Copy,
{
fn from(
button: Button<'a, Message, Renderer>,

1
native/src/widget/checkbox.rs
View file

@ -197,6 +197,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

10
native/src/widget/column.rs
View file

@ -187,13 +187,21 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) {
for (child, layout) in self.children.iter().zip(layout.children()) {
child.draw(renderer, style, layout, cursor_position, viewport);
child.draw(
renderer,
theme,
style,
layout,
cursor_position,
viewport,
);
}
}

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

@ -209,6 +209,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
renderer_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -220,6 +221,7 @@ where
self.content.draw(
renderer,
theme,
&renderer::Style {
text_color: style
.text_color

1
native/src/widget/image.rs
View file

@ -136,6 +136,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

1
native/src/widget/image/viewer.rs
View file

@ -303,6 +303,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

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

@ -754,6 +754,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -772,7 +773,14 @@ where
self.style_sheet.as_ref(),
self.elements.iter().map(|(pane, content)| (*pane, content)),
|pane, renderer, style, layout, cursor_position, rectangle| {
pane.draw(renderer, style, layout, cursor_position, rectangle);
pane.draw(
renderer,
theme,
style,
layout,
cursor_position,
rectangle,
);
},
)
}

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

@ -59,6 +59,7 @@ where
pub fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -81,6 +82,7 @@ where
title_bar.draw(
renderer,
theme,
style,
title_bar_layout,
cursor_position,
@ -90,14 +92,21 @@ where
self.body.draw(
renderer,
theme,
style,
body_layout,
cursor_position,
viewport,
);
} else {
self.body
.draw(renderer, style, layout, cursor_position, viewport);
self.body.draw(
renderer,
theme,
style,
layout,
cursor_position,
viewport,
);
}
}

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

@ -86,6 +86,7 @@ where
pub fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
inherited_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -108,6 +109,7 @@ where
self.content.draw(
renderer,
theme,
&inherited_style,
title_layout,
cursor_position,
@ -120,6 +122,7 @@ where
if show_controls || self.always_show_controls {
controls.draw(
renderer,
theme,
&inherited_style,
controls_layout,
cursor_position,

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

@ -490,6 +490,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

1
native/src/widget/progress_bar.rs
View file

@ -97,6 +97,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

1
native/src/widget/radio.rs
View file

@ -211,6 +211,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

10
native/src/widget/row.rs
View file

@ -187,13 +187,21 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) {
for (child, layout) in self.children.iter().zip(layout.children()) {
child.draw(renderer, style, layout, cursor_position, viewport);
child.draw(
renderer,
theme,
style,
layout,
cursor_position,
viewport,
);
}
}

1
native/src/widget/rule.rs
View file

@ -70,6 +70,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

2
native/src/widget/scrollable.rs
View file

@ -702,6 +702,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -719,6 +720,7 @@ where
|renderer, layout, cursor_position, viewport| {
self.content.draw(
renderer,
theme,
style,
layout,
cursor_position,

1
native/src/widget/slider.rs
View file

@ -410,6 +410,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

1
native/src/widget/space.rs
View file

@ -60,6 +60,7 @@ where
fn draw(
&self,
_renderer: &mut Renderer,
_theme: &Renderer::Theme,
_style: &renderer::Style,
_layout: Layout<'_>,
_cursor_position: Point,

1
native/src/widget/svg.rs
View file

@ -110,6 +110,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

1
native/src/widget/text.rs
View file

@ -130,6 +130,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
_cursor_position: Point,

1
native/src/widget/text_input.rs
View file

@ -812,6 +812,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

1
native/src/widget/toggler.rs
View file

@ -208,6 +208,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

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

@ -267,6 +267,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
inherited_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -274,6 +275,7 @@ where
) {
self.content.draw(
renderer,
theme,
inherited_style,
layout,
cursor_position,
@ -299,6 +301,7 @@ where
Widget::<(), Renderer>::draw(
tooltip,
renderer,
theme,
defaults,
layout,
cursor_position,

7
pure/src/element.rs
View file

@ -25,7 +25,10 @@ pub struct Element<'a, Message, Renderer> {
impl<'a, Message, Renderer> Element<'a, Message, Renderer> {
/// Creates a new [`Element`] containing the given [`Widget`].
pub fn new(widget: impl Widget<Message, Renderer> + 'a) -> Self {
pub fn new(widget: impl Widget<Message, Renderer> + 'a) -> Self
where
Renderer: iced_native::Renderer,
{
Self {
widget: Box::new(widget),
}
@ -278,6 +281,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -286,6 +290,7 @@ where
self.widget.draw(
tree,
renderer,
theme,
style,
layout,
cursor_position,

7
pure/src/helpers.rs
View file

@ -50,7 +50,12 @@ where
/// [`Button`]: widget::Button
pub fn button<'a, Message, Renderer>(
content: impl Into<Element<'a, Message, Renderer>>,
) -> widget::Button<'a, Message, Renderer> {
) -> widget::Button<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: widget::button::StyleSheet,
<Renderer::Theme as widget::button::StyleSheet>::Variant: Default,
{
widget::Button::new(content)
}

6
pure/src/lib.rs
View file

@ -174,7 +174,9 @@ impl State {
fn diff<Message, Renderer>(
&mut self,
new_element: &Element<'_, Message, Renderer>,
) {
) where
Renderer: iced_native::Renderer,
{
self.state_tree.diff(new_element);
}
}
@ -224,6 +226,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -232,6 +235,7 @@ where
self.element.as_widget().draw(
&self.state.state_tree,
renderer,
theme,
style,
layout,
cursor_position,

5
pure/src/overlay.rs
View file

@ -14,7 +14,10 @@ pub fn from_children<'a, Message, Renderer>(
tree: &'a mut Tree,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<Element<'a, Message, Renderer>> {
) -> Option<Element<'a, Message, Renderer>>
where
Renderer: iced_native::Renderer,
{
children
.iter()
.zip(&mut tree.children)

6
pure/src/widget.rs
View file

@ -53,7 +53,10 @@ use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
///
/// If you want to build your own widgets, you will need to implement this
/// trait.
pub trait Widget<Message, Renderer> {
pub trait Widget<Message, Renderer>
where
Renderer: iced_native::Renderer,
{
/// Returns the width of the [`Widget`].
fn width(&self) -> Length;
@ -75,6 +78,7 @@ pub trait Widget<Message, Renderer> {
&self,
state: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

32
pure/src/widget/button.rs
View file

@ -50,25 +50,34 @@ use button::State;
/// disabled_button().on_press(Message::ButtonPressed)
/// }
/// ```
pub struct Button<'a, Message, Renderer> {
pub struct Button<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet,
{
content: Element<'a, Message, Renderer>,
on_press: Option<Message>,
style_sheet: Box<dyn StyleSheet + 'a>,
width: Length,
height: Length,
padding: Padding,
variant: <Renderer::Theme as StyleSheet>::Variant,
}
impl<'a, Message, Renderer> Button<'a, Message, Renderer> {
impl<'a, Message, Renderer> Button<'a, Message, Renderer>
where
Renderer: iced_native::Renderer,
Renderer::Theme: StyleSheet,
<Renderer::Theme as StyleSheet>::Variant: Default,
{
/// Creates a new [`Button`] with the given content.
pub fn new(content: impl Into<Element<'a, Message, Renderer>>) -> Self {
Button {
content: content.into(),
on_press: None,
style_sheet: Default::default(),
width: Length::Shrink,
height: Length::Shrink,
padding: Padding::new(5),
variant: <Renderer::Theme as StyleSheet>::Variant::default(),
}
}
@ -98,12 +107,12 @@ impl<'a, Message, Renderer> Button<'a, Message, Renderer> {
self
}
/// Sets the style of the [`Button`].
/// Sets the style variant of this [`Button`].
pub fn style(
mut self,
style_sheet: impl Into<Box<dyn StyleSheet + 'a>>,
variant: <Renderer::Theme as StyleSheet>::Variant,
) -> Self {
self.style_sheet = style_sheet.into();
self.variant = variant;
self
}
}
@ -113,6 +122,8 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
where
Message: 'a + Clone,
Renderer: 'a + iced_native::Renderer,
Renderer::Theme: StyleSheet,
<Renderer::Theme as StyleSheet>::Variant: Copy,
{
fn tag(&self) -> tree::Tag {
tree::Tag::of::<State>()
@ -191,6 +202,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -204,13 +216,15 @@ where
bounds,
cursor_position,
self.on_press.is_some(),
self.style_sheet.as_ref(),
theme,
self.variant,
|| tree.state.downcast_ref::<State>(),
);
self.content.as_widget().draw(
&tree.children[0],
renderer,
theme,
&renderer::Style {
text_color: styling.text_color,
},
@ -254,6 +268,8 @@ impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
where
Message: Clone + 'a,
Renderer: iced_native::Renderer + 'a,
Renderer::Theme: StyleSheet,
<Renderer::Theme as StyleSheet>::Variant: Copy,
{
fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self)

2
pure/src/widget/checkbox.rs
View file

@ -59,6 +59,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -67,6 +68,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

2
pure/src/widget/column.rs
View file

@ -194,6 +194,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -208,6 +209,7 @@ where
child.as_widget().draw(
state,
renderer,
theme,
style,
layout,
cursor_position,

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

@ -201,6 +201,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
renderer_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -213,6 +214,7 @@ where
self.content.as_widget().draw(
&tree.children[0],
renderer,
theme,
&renderer::Style {
text_color: style
.text_color

2
pure/src/widget/image.rs
View file

@ -38,6 +38,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -46,6 +47,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

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

@ -331,6 +331,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -360,6 +361,7 @@ where
content.draw(
tree,
renderer,
theme,
style,
layout,
cursor_position,

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

@ -89,6 +89,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -112,6 +113,7 @@ where
title_bar.draw(
&tree.children[1],
renderer,
theme,
style,
title_bar_layout,
cursor_position,
@ -122,6 +124,7 @@ where
self.body.as_widget().draw(
&tree.children[0],
renderer,
theme,
style,
body_layout,
cursor_position,
@ -131,6 +134,7 @@ where
self.body.as_widget().draw(
&tree.children[0],
renderer,
theme,
style,
layout,
cursor_position,

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

@ -113,6 +113,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
inherited_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -136,6 +137,7 @@ where
self.content.as_widget().draw(
&tree.children[0],
renderer,
theme,
&inherited_style,
title_layout,
cursor_position,
@ -149,6 +151,7 @@ where
controls.as_widget().draw(
&tree.children[1],
renderer,
theme,
&inherited_style,
controls_layout,
cursor_position,

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

@ -181,6 +181,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
_theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

2
pure/src/widget/progress_bar.rs
View file

@ -57,6 +57,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -65,6 +66,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

2
pure/src/widget/radio.rs
View file

@ -60,6 +60,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -68,6 +69,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

2
pure/src/widget/row.rs
View file

@ -181,6 +181,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -195,6 +196,7 @@ where
child.as_widget().draw(
state,
renderer,
theme,
style,
layout,
cursor_position,

2
pure/src/widget/rule.rs
View file

@ -57,6 +57,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -65,6 +66,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

2
pure/src/widget/scrollable.rs
View file

@ -171,6 +171,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -189,6 +190,7 @@ where
self.content.as_widget().draw(
&tree.children[0],
renderer,
theme,
style,
layout,
cursor_position,

1
pure/src/widget/slider.rs
View file

@ -195,6 +195,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

2
pure/src/widget/space.rs
View file

@ -56,6 +56,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -64,6 +65,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

2
pure/src/widget/svg.rs
View file

@ -36,6 +36,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -44,6 +45,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

2
pure/src/widget/text.rs
View file

@ -34,6 +34,7 @@ where
&self,
_tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -42,6 +43,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

1
pure/src/widget/text_input.rs
View file

@ -190,6 +190,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,

2
pure/src/widget/toggler.rs
View file

@ -38,6 +38,7 @@ where
&self,
_state: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -46,6 +47,7 @@ where
<Self as iced_native::Widget<Message, Renderer>>::draw(
self,
renderer,
theme,
style,
layout,
cursor_position,

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

@ -157,6 +157,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &Renderer::Theme,
inherited_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
@ -165,6 +166,7 @@ where
self.content.as_widget().draw(
&tree.children[0],
renderer,
theme,
inherited_style,
layout,
cursor_position,
@ -191,6 +193,7 @@ where
tooltip,
&Tree::empty(),
renderer,
theme,
defaults,
layout,
cursor_position,

13
pure/src/widget/tree.rs
View file

@ -31,7 +31,10 @@ impl Tree {
/// Creates a new [`Tree`] for the provided [`Element`].
pub fn new<'a, Message, Renderer>(
widget: impl Borrow<dyn Widget<Message, Renderer> + 'a>,
) -> Self {
) -> Self
where
Renderer: iced_native::Renderer,
{
let widget = widget.borrow();
Self {
@ -52,7 +55,9 @@ impl Tree {
pub fn diff<'a, Message, Renderer>(
&mut self,
new: impl Borrow<dyn Widget<Message, Renderer> + 'a>,
) {
) where
Renderer: iced_native::Renderer,
{
if self.tag == new.borrow().tag() {
new.borrow().diff(self)
} else {
@ -64,7 +69,9 @@ impl Tree {
pub fn diff_children<'a, Message, Renderer>(
&mut self,
new_children: &[impl Borrow<dyn Widget<Message, Renderer> + 'a>],
) {
) where
Renderer: iced_native::Renderer,
{
self.diff_children_custom(
new_children,
|tree, widget| tree.diff(widget.borrow()),

33
src/application.rs
View file

@ -57,7 +57,7 @@ use crate::{Color, Command, Element, Executor, Settings, Subscription};
/// says "Hello, world!":
///
/// ```no_run
/// use iced::{executor, Application, Command, Element, Settings, Text};
/// use iced::{executor, Application, Command, Element, Settings, Text, Theme};
///
/// pub fn main() -> iced::Result {
/// Hello::run(Settings::default())
@ -67,8 +67,9 @@ use crate::{Color, Command, Element, Executor, Settings, Subscription};
///
/// impl Application for Hello {
/// type Executor = executor::Default;
/// type Message = ();
/// type Flags = ();
/// type Message = ();
/// type Theme = Theme;
///
/// fn new(_flags: ()) -> (Hello, Command<Self::Message>) {
/// (Hello, Command::none())
@ -99,6 +100,9 @@ pub trait Application: Sized {
/// The type of __messages__ your [`Application`] will produce.
type Message: std::fmt::Debug + Send;
/// The theme of your [`Application`].
type Theme: Default;
/// The data needed to initialize your [`Application`].
type Flags;
@ -129,6 +133,16 @@ pub trait Application: Sized {
/// Any [`Command`] returned will be executed immediately in the background.
fn update(&mut self, message: Self::Message) -> Command<Self::Message>;
/// Returns the widgets to display in the [`Application`].
///
/// These widgets can produce __messages__ based on user interaction.
fn view(&mut self) -> Element<'_, Self::Message, Self::Theme>;
/// Returns the current [`Theme`] of the [`Application`].
fn theme(&self) -> Self::Theme {
Self::Theme::default()
}
/// Returns the event [`Subscription`] for the current state of the
/// application.
///
@ -141,11 +155,6 @@ pub trait Application: Sized {
Subscription::none()
}
/// Returns the widgets to display in the [`Application`].
///
/// These widgets can produce __messages__ based on user interaction.
fn view(&mut self) -> Element<'_, Self::Message>;
/// Returns the current [`Application`] mode.
///
/// The runtime will automatically transition your application if a new mode
@ -213,7 +222,7 @@ pub trait Application: Sized {
Ok(crate::runtime::application::run::<
Instance<Self>,
Self::Executor,
crate::renderer::window::Compositor,
crate::renderer::window::Compositor<Self::Theme>,
>(settings.into(), renderer_settings)?)
}
}
@ -224,14 +233,14 @@ impl<A> iced_winit::Program for Instance<A>
where
A: Application,
{
type Renderer = crate::renderer::Renderer;
type Renderer = crate::renderer::Renderer<A::Theme>;
type Message = A::Message;
fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
self.0.update(message)
}
fn view(&mut self) -> Element<'_, Self::Message> {
fn view(&mut self) -> Element<'_, Self::Message, A::Theme> {
self.0.view()
}
}
@ -252,6 +261,10 @@ where
self.0.title()
}
fn theme(&self) -> A::Theme {
self.0.theme()
}
fn mode(&self) -> iced_winit::Mode {
match self.0.mode() {
window::Mode::Windowed => iced_winit::Mode::Windowed,

4
src/element.rs
View file

@ -1,5 +1,5 @@
/// A generic widget.
///
/// This is an alias of an `iced_native` element with a default `Renderer`.
pub type Element<'a, Message> =
crate::runtime::Element<'a, Message, crate::renderer::Renderer>;
pub type Element<'a, Message, Theme = iced_native::Theme> =
crate::runtime::Element<'a, Message, crate::Renderer<Theme>>;

Some files were not shown because too many files have changed in this diff Show more