diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-10-18 15:19:04 +0700 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-10-18 15:19:04 +0700 |
| commit | edea093350e1b576e2b7db50c525e7fa5c3bea9f (patch) | |
| tree | bcc93c11a804d04e5842cef6c2088911fd4ef822 /native/src/overlay | |
| parent | 54a9a232f8110364972a8eef966b7b7477573f4f (diff) | |
| download | iced-edea093350e1b576e2b7db50c525e7fa5c3bea9f.tar.gz iced-edea093350e1b576e2b7db50c525e7fa5c3bea9f.tar.bz2 iced-edea093350e1b576e2b7db50c525e7fa5c3bea9f.zip | |
Move `Defaults` from `iced_graphics` to `iced_native`
Diffstat (limited to 'native/src/overlay')
| -rw-r--r-- | native/src/overlay/element.rs | 11 | ||||
| -rw-r--r-- | native/src/overlay/menu.rs | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs index 081b62ce..bf3fb3f0 100644 --- a/native/src/overlay/element.rs +++ b/native/src/overlay/element.rs @@ -2,6 +2,7 @@ pub use crate::Overlay; use crate::event::{self, Event}; use crate::layout; +use crate::renderer; use crate::{Clipboard, Hasher, Layout, Point, Size, Vector}; /// A generic [`Overlay`]. @@ -71,12 +72,11 @@ where pub fn draw( &self, renderer: &mut Renderer, - defaults: &Renderer::Defaults, + style: &renderer::Style, layout: Layout<'_>, cursor_position: Point, ) { - self.overlay - .draw(renderer, defaults, layout, cursor_position) + self.overlay.draw(renderer, style, layout, cursor_position) } /// Computes the _layout_ hash of the [`Element`]. @@ -142,12 +142,11 @@ where fn draw( &self, renderer: &mut Renderer, - defaults: &Renderer::Defaults, + style: &renderer::Style, layout: Layout<'_>, cursor_position: Point, ) { - self.content - .draw(renderer, defaults, layout, cursor_position) + self.content.draw(renderer, style, layout, cursor_position) } fn hash_layout(&self, state: &mut Hasher, position: Point) { diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs index c4f64f85..f2367ae7 100644 --- a/native/src/overlay/menu.rs +++ b/native/src/overlay/menu.rs @@ -4,6 +4,7 @@ use crate::event::{self, Event}; use crate::layout; use crate::mouse; use crate::overlay; +use crate::renderer; use crate::scrollable; use crate::text; use crate::touch; @@ -236,7 +237,7 @@ where fn draw( &self, renderer: &mut Renderer, - defaults: &Renderer::Defaults, + style: &renderer::Style, layout: Layout<'_>, cursor_position: Point, ) { @@ -380,7 +381,7 @@ where fn draw( &self, _renderer: &mut Renderer, - _defaults: &Renderer::Defaults, + _style: &renderer::Style, _layout: Layout<'_>, _cursor_position: Point, _viewport: &Rectangle, |