me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1046 from iced-rs/fix/empty-text-hit-test

Browse source 
Use `Option` to encode empty text case in hit test methods
This commit is contained in:
Héctor Ramón 2021-09-15 15:50:10 +07:00 • committed by GitHub
commit 5870cbb312
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 65 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/text.rs
View file

@ -14,14 +14,14 @@ pub enum Hit {
impl Hit {
/// Computes the cursor position corresponding to this [`HitTestResult`] .
pub fn cursor(&self) -> usize {
pub fn cursor(self) -> usize {
match self {
Self::CharOffset(i) => *i,
Self::CharOffset(i) => i,
Self::NearestCharOffset(i, delta) => {
if delta.x > f32::EPSILON {
i + 1
} else {
*i
i
}
}
}

2
glow/src/backend.rs
View file

@ -221,7 +221,7 @@ impl backend::Text for Backend {
bounds: Size,
point: iced_native::Point,
nearest_only: bool,
) -> text::Hit {
) -> Option<text::Hit> {
self.text_pipeline.hit_test(
contents,
size,

26
glow/src/text.rs
View file

@ -121,7 +121,7 @@ impl Pipeline {
bounds: iced_native::Size,
point: iced_native::Point,
nearest_only: bool,
) -> Hit {
) -> Option<Hit> {
use glow_glyph::GlyphCruncher;
let glow_glyph::FontId(font_id) = self.find_font(font);
@ -182,23 +182,23 @@ impl Pipeline {
if !nearest_only {
for (idx, bounds) in bounds.clone() {
if bounds.contains(point) {
return Hit::CharOffset(char_index(idx));
return Some(Hit::CharOffset(char_index(idx)));
}
}
}
let (idx, nearest) = bounds.fold(
(0usize, iced_native::Point::ORIGIN),
|acc: (usize, iced_native::Point), (idx, bounds)| {
if bounds.center().distance(point) < acc.1.distance(point) {
(idx, bounds.center())
} else {
acc
}
},
);
let nearest = bounds
.map(|(index, bounds)| (index, bounds.center()))
.min_by(|(_, center_a), (_, center_b)| {
center_a
.distance(point)
.partial_cmp(&center_b.distance(point))
.unwrap_or(std::cmp::Ordering::Greater)
});
Hit::NearestCharOffset(char_index(idx), (point - nearest).into())
nearest.map(|(idx, center)| {
Hit::NearestCharOffset(char_index(idx), point - center)
})
}
pub fn trim_measurement_cache(&mut self) {

2
graphics/src/backend.rs
View file

@ -60,7 +60,7 @@ pub trait Text {
bounds: Size,
point: Point,
nearest_only: bool,
) -> text::Hit;
) -> Option<text::Hit>;
}
/// A graphics backend that supports image rendering.

2
graphics/src/widget/text.rs
View file

@ -43,7 +43,7 @@ where
bounds: Size,
point: Point,
nearest_only: bool,
) -> text::Hit {
) -> Option<text::Hit> {
self.backend().hit_test(
content,
size,

6
native/src/renderer/null.rs
View file

@ -2,7 +2,7 @@ use crate::{
button, checkbox, column, container, pane_grid, progress_bar, radio, row,
scrollable, slider, text, text_input, toggler, Color, Element, Font,
HorizontalAlignment, Layout, Padding, Point, Rectangle, Renderer, Size,
Vector, VerticalAlignment,
VerticalAlignment,
};
/// A renderer that does nothing.
@ -75,8 +75,8 @@ impl text::Renderer for Null {
_bounds: Size,
_point: Point,
_nearest_only: bool,
) -> text::Hit {
text::Hit::NearestCharOffset(0, Vector::new(0., 0.))
) -> Option<text::Hit> {
None
}
fn draw(

2
native/src/widget/text.rs
View file

@ -196,7 +196,7 @@ pub trait Renderer: crate::Renderer {
bounds: Size,
point: Point,
nearest_only: bool,
) -> Hit;
) -> Option<Hit>;
/// Draws a [`Text`] fragment.
///

53
native/src/widget/text_input.rs
View file

@ -268,41 +268,42 @@ where
match click.kind() {
click::Kind::Single => {
if target > 0.0 {
let position = if target > 0.0 {
let value = if self.is_secure {
self.value.secure()
} else {
self.value.clone()
};
let position = renderer.find_cursor_position(
renderer.find_cursor_position(
text_layout.bounds(),
self.font,
self.size,
&value,
&self.state,
target,
);
self.state.cursor.move_to(position);
)
} else {
self.state.cursor.move_to(0);
}
None
};
self.state.cursor.move_to(position.unwrap_or(0));
self.state.is_dragging = true;
}
click::Kind::Double => {
if self.is_secure {
self.state.cursor.select_all(&self.value);
} else {
let position = renderer.find_cursor_position(
text_layout.bounds(),
self.font,
self.size,
&self.value,
&self.state,
target,
);
let position = renderer
.find_cursor_position(
text_layout.bounds(),
self.font,
self.size,
&self.value,
&self.state,
target,
)
.unwrap_or(0);
self.state.cursor.select_range(
self.value.previous_start_of_word(position),
@ -341,14 +342,16 @@ where
self.value.clone()
};
let position = renderer.find_cursor_position(
text_layout.bounds(),
self.font,
self.size,
&value,
&self.state,
target,
);
let position = renderer
.find_cursor_position(
text_layout.bounds(),
self.font,
self.size,
&value,
&self.state,
target,
)
.unwrap_or(0);
self.state.cursor.select_range(
self.state.cursor.start(&value),
@ -702,7 +705,7 @@ pub trait Renderer: text::Renderer + Sized {
value: &Value,
state: &State,
x: f32,
) -> usize {
) -> Option<usize> {
let size = size.unwrap_or(self.default_size());
let offset = self.offset(text_bounds, font, size, &value, &state);
@ -715,7 +718,7 @@ pub trait Renderer: text::Renderer + Sized {
Point::new(x + offset, text_bounds.height / 2.0),
true,
)
.cursor()
.map(text::Hit::cursor)
}
}

2
wgpu/src/backend.rs
View file

@ -284,7 +284,7 @@ impl backend::Text for Backend {
bounds: Size,
point: iced_native::Point,
nearest_only: bool,
) -> text::Hit {
) -> Option<text::Hit> {
self.text_pipeline.hit_test(
contents,
size,

26
wgpu/src/text.rs
View file

@ -129,7 +129,7 @@ impl Pipeline {
bounds: iced_native::Size,
point: iced_native::Point,
nearest_only: bool,
) -> Hit {
) -> Option<Hit> {
use wgpu_glyph::GlyphCruncher;
let wgpu_glyph::FontId(font_id) = self.find_font(font);
@ -190,23 +190,23 @@ impl Pipeline {
if !nearest_only {
for (idx, bounds) in bounds.clone() {
if bounds.contains(point) {
return Hit::CharOffset(char_index(idx));
return Some(Hit::CharOffset(char_index(idx)));
}
}
}
let (idx, nearest) = bounds.fold(
(0usize, iced_native::Point::ORIGIN),
|acc: (usize, iced_native::Point), (idx, bounds)| {
if bounds.center().distance(point) < acc.1.distance(point) {
(idx, bounds.center())
} else {
acc
}
},
);
let nearest = bounds
.map(|(index, bounds)| (index, bounds.center()))
.min_by(|(_, center_a), (_, center_b)| {
center_a
.distance(point)
.partial_cmp(&center_b.distance(point))
.unwrap_or(std::cmp::Ordering::Greater)
});
Hit::NearestCharOffset(char_index(idx), (point - nearest).into())
nearest.map(|(idx, center)| {
Hit::NearestCharOffset(char_index(idx), point - center)
})
}
pub fn trim_measurement_cache(&mut self) {