diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-04-08 04:47:54 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-04-08 04:47:54 +0200 |
| commit | 3ee367355d4534d4eabcf2b135d64dc405984aa4 (patch) | |
| tree | b4ed4d110d9204500a1e735b989341ba09e9aff5 /tiny_skia | |
| parent | 940a47eafd098dce3567a95c38dc8697b0fc7115 (diff) | |
| parent | c0431aedd3bbef4161456f2fa5f29866e8f17fc5 (diff) | |
| download | iced-3ee367355d4534d4eabcf2b135d64dc405984aa4.tar.gz iced-3ee367355d4534d4eabcf2b135d64dc405984aa4.tar.bz2 iced-3ee367355d4534d4eabcf2b135d64dc405984aa4.zip | |
Merge branch 'advanced-text' into incremental-rendering
Diffstat (limited to 'tiny_skia')
| -rw-r--r-- | tiny_skia/Cargo.toml | 6 | ||||
| -rw-r--r-- | tiny_skia/src/text.rs | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 349f6903..7a5f5b17 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -12,6 +12,7 @@ geometry = ["iced_graphics/geometry"] raw-window-handle = "0.5" softbuffer = "0.2" tiny-skia = "0.8" +cosmic-text = "0.8" bytemuck = "1" rustc-hash = "1.1" kurbo = "0.9" @@ -22,11 +23,6 @@ version = "0.7" path = "../graphics" features = ["tiny-skia"] -[dependencies.cosmic-text] -features = ["std", "swash"] -git = "https://github.com/pop-os/cosmic-text" -rev = "e788c175ec31094b04dcacbc0537dba4433afcfc" - [dependencies.twox-hash] version = "1.6" default-features = false diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs index 512503e0..f5994d09 100644 --- a/tiny_skia/src/text.rs +++ b/tiny_skia/src/text.rs @@ -389,14 +389,7 @@ impl Cache { cosmic_text::Attrs::new() .family(to_family(key.font.family)) .weight(to_weight(key.font.weight)) - .stretch(to_stretch(key.font.stretch)) - .monospaced( - key.font.monospaced - || matches!( - key.font.family, - font::Family::Monospace - ), - ), + .stretch(to_stretch(key.font.stretch)), ); let _ = entry.insert(buffer); |