diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-20 20:28:35 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-20 20:28:35 +0200 |
| commit | a1a5fcfd46622d5b18d1716aa2adb4659835ccf3 (patch) | |
| tree | 8c9c2468151ebcc517688edc6d0d4867c11c441c /native | |
| parent | 720e7756f2afe30706b6b1a7fbde86b9f15e1d8c (diff) | |
| download | iced-a1a5fcfd46622d5b18d1716aa2adb4659835ccf3.tar.gz iced-a1a5fcfd46622d5b18d1716aa2adb4659835ccf3.tar.bz2 iced-a1a5fcfd46622d5b18d1716aa2adb4659835ccf3.zip | |
Refactor `Viewport` and `Compositor`
Diffstat (limited to '')
| -rw-r--r-- | graphics/src/window/compositor.rs (renamed from native/src/window/compositor.rs) | 10 | ||||
| -rw-r--r-- | native/Cargo.toml | 1 | ||||
| -rw-r--r-- | native/src/window.rs | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/native/src/window/compositor.rs b/graphics/src/window/compositor.rs index ae010c89..82faa6e1 100644 --- a/native/src/window/compositor.rs +++ b/graphics/src/window/compositor.rs @@ -1,5 +1,5 @@ -use crate::mouse; - +use crate::Viewport; +use iced_native::mouse; use raw_window_handle::HasRawWindowHandle; /// A graphics compositor that can draw to windows. @@ -8,7 +8,7 @@ pub trait Compositor: Sized { type Settings: Default + Clone; /// The iced renderer of the backend. - type Renderer: crate::Renderer; + type Renderer: iced_native::Renderer; /// The surface of the backend. type Surface; @@ -53,8 +53,8 @@ pub trait Compositor: Sized { &mut self, renderer: &mut Self::Renderer, swap_chain: &mut Self::SwapChain, - output: &<Self::Renderer as crate::Renderer>::Output, - scale_factor: f64, + viewport: &Viewport, + output: &<Self::Renderer as iced_native::Renderer>::Output, overlay: &[T], ) -> mouse::Interaction; } diff --git a/native/Cargo.toml b/native/Cargo.toml index 7e9c2a5a..067b8708 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -9,7 +9,6 @@ repository = "https://github.com/hecrj/iced" [dependencies] twox-hash = "1.5" -raw-window-handle = "0.3" unicode-segmentation = "1.6" [dependencies.iced_core] diff --git a/native/src/window.rs b/native/src/window.rs index 84269fbf..220bb3be 100644 --- a/native/src/window.rs +++ b/native/src/window.rs @@ -1,6 +1,4 @@ //! Build window-based GUI applications. -mod compositor; mod event; -pub use compositor::Compositor; pub use event::Event; |