From 7a50e9e8fbb8d37e53a42c1dd5936b97463ead53 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 21 Jan 2024 17:56:01 +0100 Subject: Convert `Renderer::Theme` to generic `Widget` type --- src/application.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/application.rs') diff --git a/src/application.rs b/src/application.rs index 9518b8c5..01b2032f 100644 --- a/src/application.rs +++ b/src/application.rs @@ -139,7 +139,7 @@ pub trait Application: Sized { /// Returns the widgets to display in the [`Application`]. /// /// These widgets can produce __messages__ based on user interaction. - fn view(&self) -> Element<'_, Self::Message, crate::Renderer>; + fn view(&self) -> Element<'_, Self::Message, Self::Theme, crate::Renderer>; /// Returns the current [`Theme`] of the [`Application`]. /// @@ -208,7 +208,7 @@ pub trait Application: Sized { Ok(crate::shell::application::run::< Instance, Self::Executor, - crate::renderer::Compositor, + crate::renderer::Compositor, >(settings.into(), renderer_settings)?) } } @@ -219,14 +219,15 @@ impl crate::runtime::Program for Instance where A: Application, { - type Renderer = crate::Renderer; type Message = A::Message; + type Theme = A::Theme; + type Renderer = crate::Renderer; fn update(&mut self, message: Self::Message) -> Command { self.0.update(message) } - fn view(&self) -> Element<'_, Self::Message, Self::Renderer> { + fn view(&self) -> Element<'_, Self::Message, Self::Theme, Self::Renderer> { self.0.view() } } -- cgit