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

Merge pull request #2210 from MoSal/glyph_cache_capacity_limit

Browse source 
tiny_skia: Add a capacity limit to `GlyphCache`
This commit is contained in:
Héctor Ramón 2024-02-07 14:40:44 +01:00 • committed by GitHub
commit b4dcf4ecf7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -58,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Use `Radians` for angle fields in `Arc` and `arc::Elliptical`. [#2027](https://github.com/iced-rs/iced/pull/2027) - Use `Radians` for angle fields in `Arc` and `arc::Elliptical`. [#2027](https://github.com/iced-rs/iced/pull/2027)
- Assert dimensions of quads are normal in `iced_tiny_skia`. [#2082](https://github.com/iced-rs/iced/pull/2082) - Assert dimensions of quads are normal in `iced_tiny_skia`. [#2082](https://github.com/iced-rs/iced/pull/2082)
- Remove `position` from `overlay::Element`. [#2226](https://github.com/iced-rs/iced/pull/2226) - Remove `position` from `overlay::Element`. [#2226](https://github.com/iced-rs/iced/pull/2226)
- Add a capacity limit to the `GlyphCache` in `iced_tiny_skia`. [#2210](https://github.com/iced-rs/iced/pull/2210)
### Fixed ### Fixed
- Clipping of `TextInput` selection. [#2199](https://github.com/iced-rs/iced/pull/2199) - Clipping of `TextInput` selection. [#2199](https://github.com/iced-rs/iced/pull/2199)
@ -126,6 +127,7 @@ Many thanks to...
- @lufte - @lufte
- @matze - @matze
- @MichalLebeda - @MichalLebeda
- @MoSal
- @MrAntix - @MrAntix
- @nicksenger - @nicksenger
- @Nisatru - @Nisatru

8
tiny_skia/src/text.rs
View file

@ -273,6 +273,7 @@ struct GlyphCache {
impl GlyphCache { impl GlyphCache {
const TRIM_INTERVAL: usize = 300; const TRIM_INTERVAL: usize = 300;
const CAPACITY_LIMIT: usize = 16 * 1024;
fn new() -> Self { fn new() -> Self {
GlyphCache::default() GlyphCache::default()
@ -359,12 +360,17 @@ impl GlyphCache {
} }
pub fn trim(&mut self) { pub fn trim(&mut self) {
if self.trim_count > Self::TRIM_INTERVAL { if self.trim_count > Self::TRIM_INTERVAL
|| self.recently_used.len() >= Self::CAPACITY_LIMIT
{
self.entries self.entries
.retain(|key, _| self.recently_used.contains(key)); .retain(|key, _| self.recently_used.contains(key));
self.recently_used.clear(); self.recently_used.clear();
self.entries.shrink_to(Self::CAPACITY_LIMIT);
self.recently_used.shrink_to(Self::CAPACITY_LIMIT);
self.trim_count = 0; self.trim_count = 0;
} else { } else {
self.trim_count += 1; self.trim_count += 1;