diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2023-03-09 19:05:38 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-03-09 19:05:38 +0100 |
| commit | caf2836b1b15bff6e8a2ea72441d67f297eb8707 (patch) | |
| tree | 0ffa0d1d604780999892b88de85ee93e3ed7d539 /wgpu/src/text.rs | |
| parent | 11b2c3bbe31a43e73a61b9bd9f022233f302ae27 (diff) | |
| parent | 424ac8177309440bbd8efe0dd9f7622cb10807ce (diff) | |
| download | iced-caf2836b1b15bff6e8a2ea72441d67f297eb8707.tar.gz iced-caf2836b1b15bff6e8a2ea72441d67f297eb8707.tar.bz2 iced-caf2836b1b15bff6e8a2ea72441d67f297eb8707.zip | |
Merge pull request #1748 from iced-rs/feature/software-renderer
Software renderer, runtime renderer fallback, and core consolidation
Diffstat (limited to 'wgpu/src/text.rs')
| -rw-r--r-- | wgpu/src/text.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs index 3839b31f..e99844e6 100644 --- a/wgpu/src/text.rs +++ b/wgpu/src/text.rs @@ -1,8 +1,7 @@ -pub use iced_native::text::Hit; - -use iced_graphics::layer::Text; -use iced_native::alignment; -use iced_native::{Font, Rectangle, Size}; +use crate::core::alignment; +use crate::core::text::Hit; +use crate::core::{Font, Point, Rectangle, Size}; +use crate::layer::Text; use rustc_hash::{FxHashMap, FxHashSet}; use std::borrow::Cow; @@ -275,9 +274,9 @@ impl Pipeline { &self, content: &str, size: f32, - font: iced_native::Font, - bounds: iced_native::Size, - point: iced_native::Point, + font: Font, + bounds: Size, + point: Point, _nearest_only: bool, ) -> Option<Hit> { self.system.as_ref().unwrap().with(|fields| { |