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

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,