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

Use Iterator::min_by instead of fold in hit_test

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-09-15 15:08:35 +07:00
parent 643500bbdf
commit c914b2a05b
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
glow/src/text.rs
View file

@ -187,20 +187,18 @@ impl Pipeline {
} }
} }
let (idx, nearest) = bounds.fold( let nearest = bounds
(None, iced_native::Point::ORIGIN), .map(|(index, bounds)| (index, bounds.center()))
|best, (idx, bounds)| { .min_by(|(_, center_a), (_, center_b)| {
let center = bounds.center(); center_a
.distance(point)
.partial_cmp(&center_b.distance(point))
.unwrap_or(std::cmp::Ordering::Greater)
});
if center.distance(point) < best.1.distance(point) { nearest.map(|(idx, center)| {
(Some(idx), center) Hit::NearestCharOffset(char_index(idx), point - center)
} else { })
best
}
},
);
idx.map(|idx| Hit::NearestCharOffset(char_index(idx), point - nearest))
} }
pub fn trim_measurement_cache(&mut self) { pub fn trim_measurement_cache(&mut self) {

24
wgpu/src/text.rs
View file

@ -195,20 +195,18 @@ impl Pipeline {
} }
} }
let (idx, nearest) = bounds.fold( let nearest = bounds
(None, iced_native::Point::ORIGIN), .map(|(index, bounds)| (index, bounds.center()))
|best, (idx, bounds)| { .min_by(|(_, center_a), (_, center_b)| {
let center = bounds.center(); center_a
.distance(point)
.partial_cmp(&center_b.distance(point))
.unwrap_or(std::cmp::Ordering::Greater)
});
if center.distance(point) < best.1.distance(point) { nearest.map(|(idx, center)| {
(Some(idx), center) Hit::NearestCharOffset(char_index(idx), point - center)
} else { })
best
}
},
);
idx.map(|idx| Hit::NearestCharOffset(char_index(idx), point - nearest))
} }
pub fn trim_measurement_cache(&mut self) { pub fn trim_measurement_cache(&mut self) {