diff options
author | 2024-01-22 11:48:38 +0100 | |
---|---|---|
committer | 2024-01-22 11:48:38 +0100 | |
commit | 416e0026c021a8222c925979053d985553f947a6 (patch) | |
tree | beb8bb6fd28459d6a0b4c39fb5812f9c126a035e /src/multi_window | |
parent | 545cc909c9f356dd733d273173694db9b8c28594 (diff) | |
parent | e695f7a04c16f786154f25a486b649ddbfd62939 (diff) | |
download | iced-416e0026c021a8222c925979053d985553f947a6.tar.gz iced-416e0026c021a8222c925979053d985553f947a6.tar.bz2 iced-416e0026c021a8222c925979053d985553f947a6.zip |
Merge pull request #2209 from iced-rs/remove-associated-theme
`Themer` widget
Diffstat (limited to 'src/multi_window')
-rw-r--r-- | src/multi_window/application.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/multi_window/application.rs b/src/multi_window/application.rs index 4a91bdf4..ac625281 100644 --- a/src/multi_window/application.rs +++ b/src/multi_window/application.rs @@ -114,7 +114,7 @@ pub trait Application: Sized { fn view( &self, window: window::Id, - ) -> Element<'_, Self::Message, crate::Renderer<Self::Theme>>; + ) -> Element<'_, Self::Message, Self::Theme, crate::Renderer>; /// Returns the current [`Theme`] of the `window` of the [`Application`]. /// @@ -185,7 +185,7 @@ pub trait Application: Sized { Ok(crate::shell::multi_window::run::< Instance<Self>, Self::Executor, - crate::renderer::Compositor<Self::Theme>, + crate::renderer::Compositor, >(settings.into(), renderer_settings)?) } } @@ -196,8 +196,9 @@ impl<A> crate::runtime::multi_window::Program for Instance<A> where A: Application, { - type Renderer = crate::Renderer<A::Theme>; type Message = A::Message; + type Theme = A::Theme; + type Renderer = crate::Renderer; fn update(&mut self, message: Self::Message) -> Command<Self::Message> { self.0.update(message) @@ -206,7 +207,7 @@ where fn view( &self, window: window::Id, - ) -> Element<'_, Self::Message, Self::Renderer> { + ) -> Element<'_, Self::Message, Self::Theme, Self::Renderer> { self.0.view(window) } } |