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

Introduce text::Shaping enum and replace magic boolean

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-04-19 02:00:45 +02:00
parent 33b5a90019
commit 4bd290afe7
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
25 changed files with 203 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tiny_skia/src/backend.rs
View file

@ -219,7 +219,7 @@ impl Backend {
font,
horizontal_alignment,
vertical_alignment,
advanced_shape,
shaping,
} => {
let physical_bounds =
(primitive.bounds() + translation) * scale_factor;
@ -239,7 +239,7 @@ impl Backend {
*font,
*horizontal_alignment,
*vertical_alignment,
*advanced_shape,
*shaping,
pixels,
clip_mask,
);
@ -628,10 +628,10 @@ impl backend::Text for Backend {
size: f32,
font: Font,
bounds: Size,
advanced_shape: bool,
shaping: text::Shaping,
) -> (f32, f32) {
self.text_pipeline
.measure(contents, size, font, bounds, advanced_shape)
.measure(contents, size, font, bounds, shaping)
}
fn hit_test(
@ -640,18 +640,18 @@ impl backend::Text for Backend {
size: f32,
font: Font,
bounds: Size,
shaping: text::Shaping,
point: Point,
nearest_only: bool,
advanced_shape: bool,
) -> Option<text::Hit> {
self.text_pipeline.hit_test(
contents,
size,
font,
bounds,
shaping,
point,
nearest_only,
advanced_shape,
)
}

2
tiny_skia/src/geometry.rs
View file

@ -114,7 +114,7 @@ impl Frame {
font: text.font,
horizontal_alignment: text.horizontal_alignment,
vertical_alignment: text.vertical_alignment,
advanced_shape: text.advanced_shape,
shaping: text.shaping,
});
}

18
tiny_skia/src/text.rs
View file

@ -1,6 +1,6 @@
use crate::core::alignment;
use crate::core::font::{self, Font};
use crate::core::text::Hit;
use crate::core::text::{Hit, Shaping};
use crate::core::{Color, Point, Rectangle, Size};
use rustc_hash::{FxHashMap, FxHashSet};
@ -49,7 +49,7 @@ impl Pipeline {
font: Font,
horizontal_alignment: alignment::Horizontal,
vertical_alignment: alignment::Vertical,
advanced_shape: bool,
shaping: Shaping,
pixels: &mut tiny_skia::PixmapMut<'_>,
clip_mask: Option<&tiny_skia::Mask>,
) {
@ -64,7 +64,7 @@ impl Pipeline {
content,
font,
size,
advanced_shape,
shaping,
};
let (_, buffer) = self.render_cache.allocate(font_system, key);
@ -132,7 +132,7 @@ impl Pipeline {
size: f32,
font: Font,
bounds: Size,
advanced_shape: bool,
shaping: Shaping,
) -> (f32, f32) {
let mut measurement_cache = self.measurement_cache.borrow_mut();
@ -143,7 +143,7 @@ impl Pipeline {
size,
font,
bounds,
advanced_shape,
shaping,
},
);
@ -163,9 +163,9 @@ impl Pipeline {
size: f32,
font: Font,
bounds: Size,
shaping: Shaping,
point: Point,
_nearest_only: bool,
advanced_shape: bool,
) -> Option<Hit> {
let mut measurement_cache = self.measurement_cache.borrow_mut();
@ -176,7 +176,7 @@ impl Pipeline {
size,
font,
bounds,
advanced_shape,
shaping,
},
);
@ -396,7 +396,7 @@ impl Cache {
.family(to_family(key.font.family))
.weight(to_weight(key.font.weight))
.stretch(to_stretch(key.font.stretch)),
!key.advanced_shape,
matches!(key.shaping, Shaping::Basic),
);
let _ = entry.insert(buffer);
@ -427,7 +427,7 @@ struct Key<'a> {
size: f32,
font: Font,
bounds: Size,
advanced_shape: bool,
shaping: Shaping,
}
type KeyHash = u64;