From edea093350e1b576e2b7db50c525e7fa5c3bea9f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 18 Oct 2021 15:19:04 +0700 Subject: Move `Defaults` from `iced_graphics` to `iced_native` --- graphics/src/widget/canvas.rs | 6 ++++-- graphics/src/widget/qr_code.rs | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'graphics/src/widget') diff --git a/graphics/src/widget/canvas.rs b/graphics/src/widget/canvas.rs index 7bf00ca5..3990c2b9 100644 --- a/graphics/src/widget/canvas.rs +++ b/graphics/src/widget/canvas.rs @@ -3,7 +3,9 @@ //! A [`Canvas`] widget can be used to draw different kinds of 2D shapes in a //! [`Frame`]. It can be used for animation, data visualization, game graphics, //! and more! -use crate::{Backend, Defaults, Renderer}; +use crate::renderer::{self, Renderer}; +use crate::Backend; + use iced_native::layout; use iced_native::{ Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget, @@ -187,7 +189,7 @@ where fn draw( &self, _renderer: &mut Renderer, - _defaults: &Defaults, + _style: &renderer::Style, _layout: Layout<'_>, _cursor_position: Point, _viewport: &Rectangle, diff --git a/graphics/src/widget/qr_code.rs b/graphics/src/widget/qr_code.rs index a809d99f..364b636b 100644 --- a/graphics/src/widget/qr_code.rs +++ b/graphics/src/widget/qr_code.rs @@ -1,10 +1,11 @@ //! Encode and display information in a QR code. use crate::canvas; -use crate::{Backend, Defaults, Renderer}; +use crate::renderer::{self, Renderer}; +use crate::Backend; +use iced_native::layout; use iced_native::{ - layout, Color, Element, Hasher, Layout, Length, Point, Rectangle, Size, - Widget, + Color, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget, }; use thiserror::Error; @@ -81,7 +82,7 @@ where fn draw( &self, _renderer: &mut Renderer, - _defaults: &Defaults, + _style: &renderer::Style, _layout: Layout<'_>, _cursor_position: Point, _viewport: &Rectangle, -- cgit