diff options
Diffstat (limited to 'winit/src/multi_window')
-rw-r--r-- | winit/src/multi_window/state.rs | 11 | ||||
-rw-r--r-- | winit/src/multi_window/window_manager.rs | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/winit/src/multi_window/state.rs b/winit/src/multi_window/state.rs index 235771f4..2e97a13d 100644 --- a/winit/src/multi_window/state.rs +++ b/winit/src/multi_window/state.rs @@ -1,5 +1,4 @@ use crate::conversion; -use crate::core; use crate::core::{mouse, window}; use crate::core::{Color, Size}; use crate::graphics::Viewport; @@ -14,7 +13,7 @@ use winit::window::Window; /// The state of a multi-windowed [`Application`]. pub struct State<A: Application> where - <A::Renderer as core::Renderer>::Theme: application::StyleSheet, + A::Theme: application::StyleSheet, { title: String, scale_factor: f64, @@ -22,13 +21,13 @@ where viewport_version: u64, cursor_position: Option<winit::dpi::PhysicalPosition<f64>>, modifiers: winit::keyboard::ModifiersState, - theme: <A::Renderer as core::Renderer>::Theme, + theme: A::Theme, appearance: application::Appearance, } impl<A: Application> Debug for State<A> where - <A::Renderer as core::Renderer>::Theme: application::StyleSheet, + A::Theme: application::StyleSheet, { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.debug_struct("multi_window::State") @@ -44,7 +43,7 @@ where impl<A: Application> State<A> where - <A::Renderer as core::Renderer>::Theme: application::StyleSheet, + A::Theme: application::StyleSheet, { /// Creates a new [`State`] for the provided [`Application`]'s `window`. pub fn new( @@ -124,7 +123,7 @@ where } /// Returns the current theme of the [`State`]. - pub fn theme(&self) -> &<A::Renderer as core::Renderer>::Theme { + pub fn theme(&self) -> &A::Theme { &self.theme } diff --git a/winit/src/multi_window/window_manager.rs b/winit/src/multi_window/window_manager.rs index 9e15f9ea..23f3c0ba 100644 --- a/winit/src/multi_window/window_manager.rs +++ b/winit/src/multi_window/window_manager.rs @@ -12,7 +12,7 @@ use winit::monitor::MonitorHandle; #[allow(missing_debug_implementations)] pub struct WindowManager<A: Application, C: Compositor> where - <A::Renderer as crate::core::Renderer>::Theme: StyleSheet, + A::Theme: StyleSheet, C: Compositor<Renderer = A::Renderer>, { aliases: BTreeMap<winit::window::WindowId, Id>, @@ -23,7 +23,7 @@ impl<A, C> WindowManager<A, C> where A: Application, C: Compositor<Renderer = A::Renderer>, - <A::Renderer as crate::core::Renderer>::Theme: StyleSheet, + A::Theme: StyleSheet, { pub fn new() -> Self { Self { @@ -109,7 +109,7 @@ impl<A, C> Default for WindowManager<A, C> where A: Application, C: Compositor<Renderer = A::Renderer>, - <A::Renderer as crate::core::Renderer>::Theme: StyleSheet, + A::Theme: StyleSheet, { fn default() -> Self { Self::new() @@ -121,7 +121,7 @@ pub struct Window<A, C> where A: Application, C: Compositor<Renderer = A::Renderer>, - <A::Renderer as crate::core::Renderer>::Theme: StyleSheet, + A::Theme: StyleSheet, { pub raw: Arc<winit::window::Window>, pub state: State<A>, @@ -136,7 +136,7 @@ impl<A, C> Window<A, C> where A: Application, C: Compositor<Renderer = A::Renderer>, - <A::Renderer as crate::core::Renderer>::Theme: StyleSheet, + A::Theme: StyleSheet, { pub fn position(&self) -> Option<Point> { self.raw |