Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repository = "https://github.com/linebender/parley"
accesskit = "0.24.0"
bytemuck = { version = "1.25.0", default-features = false }
fontique = { version = "0.9.0", default-features = false, path = "fontique" }
harfrust = { version = "0.7.0", default-features = false }
harfrust = { version = "0.8.0", default-features = false }
hashbrown = { version = "0.17.0", default-features = false, features = [
"default-hasher",
"raw-entry",
Expand Down
10 changes: 8 additions & 2 deletions parley/src/shape/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use alloc::vec::Vec;
use core::mem;
use core::ops::RangeInclusive;
use harfrust::ShapeOptions;

use super::layout::Layout;
use super::resolve::{ResolveContext, Resolved, ResolvedStyle};
Expand Down Expand Up @@ -413,7 +414,6 @@ fn shape_item<'a, B: Brush>(
let harf_shaper = shaper_data
.shaper(&font_ref)
.instance(Some(instance))
.point_size(Some(item.size))
.build();
let shaper_plan = scx.shape_plan_cache.entry(
cache::ShapePlanKey::new(
Expand Down Expand Up @@ -462,7 +462,13 @@ fn shape_item<'a, B: Brush>(
buffer.set_language(lang);
}

let glyph_buffer = harf_shaper.shape_with_plan(shaper_plan, buffer, &scx.features);
let glyph_buffer = harf_shaper.shape(
buffer,
ShapeOptions::new()
.plan(Some(shaper_plan))
.features(&scx.features)
.point_size(Some(item.size)),
);

// Extract relevant CharInfo slice for this segment
let char_start = char_range.start + item_text[..segment_start_offset].chars().count();
Expand Down
Loading