From 664251f3f5c7b76f69a97683af1468094bba887f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 14 May 2022 01:47:55 +0200
Subject: Draft first-class `Theme` support
RFC: https://github.com/iced-rs/rfcs/pull/6
---
winit/src/application.rs | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
(limited to 'winit')
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 90b03d56..abe6b8a9 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -51,6 +51,9 @@ pub trait Application: Program {
/// title of your application when necessary.
fn title(&self) -> String;
+ /// Returns the current [`Theme`] of the [`Application`].
+ fn theme(&self) -> <Self::Renderer as iced_native::Renderer>::Theme;
+
/// Returns the event `Subscription` for the current state of the
/// application.
///
@@ -255,6 +258,7 @@ async fn run_instance<A, E, C>(
let mut state = State::new(&application, &window);
let mut viewport_version = state.viewport_version();
+ let mut theme = application.theme();
let physical_size = state.physical_size();
@@ -327,6 +331,7 @@ async fn run_instance<A, E, C>(
let should_exit = application.should_exit();
+ theme = application.theme();
user_interface = ManuallyDrop::new(build_user_interface(
&mut application,
cache,
@@ -341,8 +346,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 {
@@ -389,8 +397,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(),
+ );
if new_mouse_interaction != mouse_interaction {
window.set_cursor_icon(conversion::mouse_interaction(
--
cgit
From 03eda9b162012c503ead649e5ccb95b7ef1d10ed Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 25 May 2022 05:01:18 +0200
Subject: Let a `Theme` control the background color of an application
... and remove `Application::background_color`
---
winit/src/application.rs | 16 ++++++----------
winit/src/application/state.rs | 13 +------------
2 files changed, 7 insertions(+), 22 deletions(-)
(limited to 'winit')
diff --git a/winit/src/application.rs b/winit/src/application.rs
index abe6b8a9..55fd9e73 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -6,9 +6,10 @@ pub use state::State;
use crate::clipboard::{self, Clipboard};
use crate::conversion;
use crate::mouse;
+use crate::theme::{self, Definition as _};
use crate::{
- Color, Command, Debug, Error, Executor, Mode, Proxy, Runtime, Settings,
- Size, Subscription,
+ Command, Debug, Error, Executor, Mode, Proxy, Runtime, Settings, Size,
+ Subscription,
};
use iced_futures::futures;
@@ -77,13 +78,6 @@ pub trait Application: Program {
Mode::Windowed
}
- /// Returns the background [`Color`] of the [`Application`].
- ///
- /// By default, it returns [`Color::WHITE`].
- fn background_color(&self) -> Color {
- Color::WHITE
- }
-
/// Returns the scale factor of the [`Application`].
///
/// It can be used to dynamically control the size of the UI at runtime
@@ -115,6 +109,7 @@ where
A: Application + 'static,
E: Executor + 'static,
C: window::Compositor<Renderer = A::Renderer> + 'static,
+ <A::Renderer as iced_native::Renderer>::Theme: theme::Definition,
{
use futures::task;
use futures::Future;
@@ -250,6 +245,7 @@ async fn run_instance<A, E, C>(
A: Application + 'static,
E: Executor + 'static,
C: window::Compositor<Renderer = A::Renderer> + 'static,
+ <A::Renderer as iced_native::Renderer>::Theme: theme::Definition,
{
use iced_futures::futures::stream::StreamExt;
use winit::event;
@@ -425,7 +421,7 @@ async fn run_instance<A, E, C>(
&mut renderer,
&mut surface,
state.viewport(),
- state.background_color(),
+ theme.background_color(),
&debug.overlay(),
) {
Ok(()) => {
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index b54d3aed..34a9b10e 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -1,5 +1,5 @@
use crate::conversion;
-use crate::{Application, Color, Debug, Mode, Point, Size, Viewport};
+use crate::{Application, Debug, Mode, Point, Size, Viewport};
use std::marker::PhantomData;
use winit::event::{Touch, WindowEvent};
@@ -10,7 +10,6 @@ use winit::window::Window;
pub struct State<A: Application> {
title: String,
mode: Mode,
- background_color: Color,
scale_factor: f64,
viewport: Viewport,
viewport_version: usize,
@@ -24,7 +23,6 @@ impl<A: Application> State<A> {
pub fn new(application: &A, window: &Window) -> Self {
let title = application.title();
let mode = application.mode();
- let background_color = application.background_color();
let scale_factor = application.scale_factor();
let viewport = {
@@ -39,7 +37,6 @@ impl<A: Application> State<A> {
Self {
title,
mode,
- background_color,
scale_factor,
viewport,
viewport_version: 0,
@@ -50,11 +47,6 @@ impl<A: Application> State<A> {
}
}
- /// Returns the current background [`Color`] of the [`State`].
- pub fn background_color(&self) -> Color {
- self.background_color
- }
-
/// Returns the current [`Viewport`] of the [`State`].
pub fn viewport(&self) -> &Viewport {
&self.viewport
@@ -187,9 +179,6 @@ impl<A: Application> State<A> {
self.mode = new_mode;
}
- // Update background color
- self.background_color = application.background_color();
-
// Update scale factor
let new_scale_factor = application.scale_factor();
--
cgit
From 822a3cd04f9edeb887d85164b0b3e556c3fde6bb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 26 May 2022 01:10:26 +0200
Subject: Let a `Theme` control the `text_color` of an application
---
winit/src/application.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'winit')
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 55fd9e73..12279bbb 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -504,7 +504,10 @@ pub fn build_user_interface<'a, A: Application>(
renderer: &mut A::Renderer,
size: Size,
debug: &mut Debug,
-) -> UserInterface<'a, A::Message, A::Renderer> {
+) -> UserInterface<'a, A::Message, A::Renderer>
+where
+ <A::Renderer as crate::Renderer>::Theme: theme::Definition,
+{
debug.view_started();
let view = application.view();
debug.view_finished();
--
cgit
From 7f3b7075db68a215f4331b4bfba1c8ddd1c4d7f3 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 26 May 2022 19:02:15 +0200
Subject: Rename `theme::Definition` to `application::StyleSheet`
---
winit/src/application.rs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'winit')
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 12279bbb..c7905c60 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -6,7 +6,6 @@ pub use state::State;
use crate::clipboard::{self, Clipboard};
use crate::conversion;
use crate::mouse;
-use crate::theme::{self, Definition as _};
use crate::{
Command, Debug, Error, Executor, Mode, Proxy, Runtime, Settings, Size,
Subscription,
@@ -19,6 +18,8 @@ use iced_graphics::window;
use iced_native::program::Program;
use iced_native::user_interface::{self, UserInterface};
+pub use iced_native::application::StyleSheet;
+
use std::mem::ManuallyDrop;
/// An interactive, native cross-platform application.
@@ -109,7 +110,7 @@ where
A: Application + 'static,
E: Executor + 'static,
C: window::Compositor<Renderer = A::Renderer> + 'static,
- <A::Renderer as iced_native::Renderer>::Theme: theme::Definition,
+ <A::Renderer as iced_native::Renderer>::Theme: StyleSheet,
{
use futures::task;
use futures::Future;
@@ -245,7 +246,7 @@ async fn run_instance<A, E, C>(
A: Application + 'static,
E: Executor + 'static,
C: window::Compositor<Renderer = A::Renderer> + 'static,
- <A::Renderer as iced_native::Renderer>::Theme: theme::Definition,
+ <A::Renderer as iced_native::Renderer>::Theme: StyleSheet,
{
use iced_futures::futures::stream::StreamExt;
use winit::event;
@@ -506,7 +507,7 @@ pub fn build_user_interface<'a, A: Application>(
debug: &mut Debug,
) -> UserInterface<'a, A::Message, A::Renderer>
where
- <A::Renderer as crate::Renderer>::Theme: theme::Definition,
+ <A::Renderer as crate::Renderer>::Theme: StyleSheet,
{
debug.view_started();
let view = application.view();
--
cgit
From bb07d017e8c8e43ac74f66bf649643bebdc5f71d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 8 Jul 2022 20:07:33 +0200
Subject: Add `Style` variant support to `application::StyleSheet`
---
winit/src/application.rs | 39 ++++++++++++++++++++++++++++-----------
winit/src/application/state.rs | 40 ++++++++++++++++++++++++++++++++++++----
2 files changed, 64 insertions(+), 15 deletions(-)
(limited to 'winit')
diff --git a/winit/src/application.rs b/winit/src/application.rs
index c7905c60..9c7dd74e 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -6,6 +6,7 @@ pub use state::State;
use crate::clipboard::{self, Clipboard};
use crate::conversion;
use crate::mouse;
+use crate::renderer;
use crate::{
Command, Debug, Error, Executor, Mode, Proxy, Runtime, Settings, Size,
Subscription,
@@ -18,7 +19,7 @@ use iced_graphics::window;
use iced_native::program::Program;
use iced_native::user_interface::{self, UserInterface};
-pub use iced_native::application::StyleSheet;
+pub use iced_native::application::{Appearance, StyleSheet};
use std::mem::ManuallyDrop;
@@ -33,7 +34,10 @@ use std::mem::ManuallyDrop;
///
/// When using an [`Application`] with the `debug` feature enabled, a debug view
/// can be toggled by pressing `F12`.
-pub trait Application: Program {
+pub trait Application: Program
+where
+ <Self::Renderer as crate::Renderer>::Theme: StyleSheet,
+{
/// The data needed to initialize your [`Application`].
type Flags;
@@ -54,7 +58,14 @@ pub trait Application: Program {
fn title(&self) -> String;
/// Returns the current [`Theme`] of the [`Application`].
- fn theme(&self) -> <Self::Renderer as iced_native::Renderer>::Theme;
+ fn theme(&self) -> <Self::Renderer as crate::Renderer>::Theme;
+
+ /// Returns the [`Style`] variation of the [`Theme`].
+ fn style(
+ &self,
+ ) -> <<Self::Renderer as crate::Renderer>::Theme as StyleSheet>::Style {
+ Default::default()
+ }
/// Returns the event `Subscription` for the current state of the
/// application.
@@ -110,7 +121,7 @@ where
A: Application + 'static,
E: Executor + 'static,
C: window::Compositor<Renderer = A::Renderer> + 'static,
- <A::Renderer as iced_native::Renderer>::Theme: StyleSheet,
+ <A::Renderer as crate::Renderer>::Theme: StyleSheet,
{
use futures::task;
use futures::Future;
@@ -246,7 +257,7 @@ async fn run_instance<A, E, C>(
A: Application + 'static,
E: Executor + 'static,
C: window::Compositor<Renderer = A::Renderer> + 'static,
- <A::Renderer as iced_native::Renderer>::Theme: StyleSheet,
+ <A::Renderer as crate::Renderer>::Theme: StyleSheet,
{
use iced_futures::futures::stream::StreamExt;
use winit::event;
@@ -255,7 +266,6 @@ async fn run_instance<A, E, C>(
let mut state = State::new(&application, &window);
let mut viewport_version = state.viewport_version();
- let mut theme = application.theme();
let physical_size = state.physical_size();
@@ -328,7 +338,6 @@ async fn run_instance<A, E, C>(
let should_exit = application.should_exit();
- theme = application.theme();
user_interface = ManuallyDrop::new(build_user_interface(
&mut application,
cache,
@@ -345,7 +354,10 @@ async fn run_instance<A, E, C>(
debug.draw_started();
let new_mouse_interaction = user_interface.draw(
&mut renderer,
- &theme,
+ state.theme(),
+ &renderer::Style {
+ text_color: state.text_color(),
+ },
state.cursor_position(),
);
debug.draw_finished();
@@ -396,7 +408,10 @@ async fn run_instance<A, E, C>(
debug.draw_started();
let new_mouse_interaction = user_interface.draw(
&mut renderer,
- &theme,
+ state.theme(),
+ &renderer::Style {
+ text_color: state.text_color(),
+ },
state.cursor_position(),
);
@@ -422,7 +437,7 @@ async fn run_instance<A, E, C>(
&mut renderer,
&mut surface,
state.viewport(),
- theme.background_color(),
+ state.background_color(),
&debug.overlay(),
) {
Ok(()) => {
@@ -531,7 +546,9 @@ pub fn update<A: Application, E: Executor>(
messages: &mut Vec<A::Message>,
window: &winit::window::Window,
graphics_info: impl FnOnce() -> compositor::Information + Copy,
-) {
+) where
+ <A::Renderer as crate::Renderer>::Theme: StyleSheet,
+{
for message in messages.drain(..) {
debug.log_message(&message);
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index 34a9b10e..6b843919 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -1,13 +1,17 @@
+use crate::application::{self, StyleSheet as _};
use crate::conversion;
-use crate::{Application, Debug, Mode, Point, Size, Viewport};
+use crate::{Application, Color, Debug, Mode, Point, Size, Viewport};
use std::marker::PhantomData;
use winit::event::{Touch, WindowEvent};
use winit::window::Window;
/// The state of a windowed [`Application`].
-#[derive(Debug, Clone)]
-pub struct State<A: Application> {
+#[allow(missing_debug_implementations)]
+pub struct State<A: Application>
+where
+ <A::Renderer as crate::Renderer>::Theme: application::StyleSheet,
+{
title: String,
mode: Mode,
scale_factor: f64,
@@ -15,15 +19,22 @@ pub struct State<A: Application> {
viewport_version: usize,
cursor_position: winit::dpi::PhysicalPosition<f64>,
modifiers: winit::event::ModifiersState,
+ theme: <A::Renderer as crate::Renderer>::Theme,
+ appearance: application::Appearance,
application: PhantomData<A>,
}
-impl<A: Application> State<A> {
+impl<A: Application> State<A>
+where
+ <A::Renderer as crate::Renderer>::Theme: application::StyleSheet,
+{
/// Creates a new [`State`] for the provided [`Application`] and window.
pub fn new(application: &A, window: &Window) -> Self {
let title = application.title();
let mode = application.mode();
let scale_factor = application.scale_factor();
+ let theme = application.theme();
+ let appearance = theme.appearance(application.style());
let viewport = {
let physical_size = window.inner_size();
@@ -43,6 +54,8 @@ impl<A: Application> State<A> {
// TODO: Encode cursor availability in the type-system
cursor_position: winit::dpi::PhysicalPosition::new(-1.0, -1.0),
modifiers: winit::event::ModifiersState::default(),
+ theme,
+ appearance,
application: PhantomData,
}
}
@@ -87,6 +100,21 @@ impl<A: Application> State<A> {
self.modifiers
}
+ /// Returns the current theme of the [`State`].
+ pub fn theme(&self) -> &<A::Renderer as crate::Renderer>::Theme {
+ &self.theme
+ }
+
+ /// Returns the current background [`Color`] of the [`State`].
+ pub fn background_color(&self) -> Color {
+ self.appearance.background_color
+ }
+
+ /// Returns the current text [`Color`] of the [`State`].
+ pub fn text_color(&self) -> Color {
+ self.appearance.text_color
+ }
+
/// Processes the provided window event and updates the [`State`]
/// accordingly.
pub fn update(
@@ -192,5 +220,9 @@ impl<A: Application> State<A> {
self.scale_factor = new_scale_factor;
}
+
+ // Update theme and appearance
+ self.theme = application.theme();
+ self.appearance = self.theme.appearance(application.style());
}
}
--
cgit