From 7614127d3641cf3224798c2f0ff07b6ae57d9a53 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 26 Aug 2021 14:41:33 +0700 Subject: Rename `HitTestResult` to `Hit` ... and also move it to a new `text` module in `iced_core` --- wgpu/src/text.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'wgpu/src/text.rs') diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs index f227cb6f..ee49ee4b 100644 --- a/wgpu/src/text.rs +++ b/wgpu/src/text.rs @@ -1,9 +1,12 @@ use crate::Transformation; + use iced_graphics::font; -use iced_native::HitTestResult; + use std::{cell::RefCell, collections::HashMap}; use wgpu_glyph::ab_glyph; +pub use iced_native::text::Hit; + #[derive(Debug)] pub struct Pipeline { draw_brush: RefCell>, @@ -126,7 +129,7 @@ impl Pipeline { bounds: iced_native::Size, point: iced_native::Point, nearest_only: bool, - ) -> HitTestResult { + ) -> Hit { use wgpu_glyph::GlyphCruncher; let wgpu_glyph::FontId(font_id) = self.find_font(font); @@ -187,7 +190,7 @@ impl Pipeline { if !nearest_only { for (idx, bounds) in bounds.clone() { if bounds.contains(point) { - return HitTestResult::CharOffset(char_index(idx)); + return Hit::CharOffset(char_index(idx)); } } } @@ -203,10 +206,7 @@ impl Pipeline { }, ); - HitTestResult::NearestCharOffset( - char_index(idx), - (point - nearest).into(), - ) + Hit::NearestCharOffset(char_index(idx), (point - nearest).into()) } pub fn trim_measurement_cache(&mut self) { -- cgit