Rename HitTestResult to Hit

... and also move it to a new `text` module in `iced_core`
This commit is contained in:
Héctor Ramón Jiménez 2021-08-26 14:41:33 +07:00
parent aa63841e2c
commit 7614127d36
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
14 changed files with 48 additions and 48 deletions

View file

@ -2,14 +2,13 @@ use crate::quad;
use crate::text;
use crate::triangle;
use crate::{Settings, Transformation};
use iced_graphics::backend;
use iced_graphics::font;
use iced_graphics::layer::Layer;
use iced_graphics::{Primitive, Viewport};
use iced_native::mouse;
use iced_native::{
Font, HitTestResult, HorizontalAlignment, Size, VerticalAlignment,
};
use iced_native::{Font, HorizontalAlignment, Size, VerticalAlignment};
#[cfg(any(feature = "image_rs", feature = "svg"))]
use crate::image;
@ -285,7 +284,7 @@ impl backend::Text for Backend {
bounds: Size,
point: iced_native::Point,
nearest_only: bool,
) -> HitTestResult {
) -> text::Hit {
self.text_pipeline.hit_test(
contents,
size,

View file

@ -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<wgpu_glyph::GlyphBrush<()>>,
@ -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) {