Revert "Bump cosmic text to 0.11 (#89)"

This reverts commit c16b6eb957.
This commit is contained in:
Héctor Ramón Jiménez 2024-05-08 19:25:47 +02:00
parent 0a688982e9
commit f07e7bab70
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 12 additions and 8 deletions

View file

@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib"
[dependencies] [dependencies]
wgpu = { version = "0.19", default-features = false, features = ["wgsl"] } wgpu = { version = "0.19", default-features = false, features = ["wgsl"] }
etagere = "0.2.10" etagere = "0.2.10"
cosmic-text = "0.11" cosmic-text = "0.10"
lru = { version = "0.12.1", default-features = false } lru = { version = "0.12.1", default-features = false }
rustc-hash = "1.1" rustc-hash = "1.1"

View file

@ -25,11 +25,13 @@ async fn run() {
// Set up window // Set up window
let (width, height) = (800, 600); let (width, height) = (800, 600);
let event_loop = EventLoop::new().unwrap(); let event_loop = EventLoop::new().unwrap();
let window = Arc::new(WindowBuilder::new() let window = Arc::new(
.with_inner_size(LogicalSize::new(width as f64, height as f64)) WindowBuilder::new()
.with_title("glyphon hello world") .with_inner_size(LogicalSize::new(width as f64, height as f64))
.build(&event_loop) .with_title("glyphon hello world")
.unwrap()); .build(&event_loop)
.unwrap(),
);
let size = window.inner_size(); let size = window.inner_size();
let scale_factor = window.scale_factor(); let scale_factor = window.scale_factor();
@ -51,7 +53,9 @@ async fn run() {
.await .await
.unwrap(); .unwrap();
let surface = instance.create_surface(window.clone()).expect("Create surface"); let surface = instance
.create_surface(window.clone())
.expect("Create surface");
let swapchain_format = TextureFormat::Bgra8UnormSrgb; let swapchain_format = TextureFormat::Bgra8UnormSrgb;
let mut config = SurfaceConfiguration { let mut config = SurfaceConfiguration {
usage: TextureUsages::RENDER_ATTACHMENT, usage: TextureUsages::RENDER_ATTACHMENT,
@ -80,7 +84,7 @@ async fn run() {
buffer.set_size(&mut font_system, physical_width, physical_height); buffer.set_size(&mut font_system, physical_width, physical_height);
buffer.set_text(&mut font_system, "Hello world! 👋\nThis is rendered with 🦅 glyphon 🦁\nThe text below should be partially clipped.\na b c d e f g h i j k l m n o p q r s t u v w x y z", Attrs::new().family(Family::SansSerif), Shaping::Advanced); buffer.set_text(&mut font_system, "Hello world! 👋\nThis is rendered with 🦅 glyphon 🦁\nThe text below should be partially clipped.\na b c d e f g h i j k l m n o p q r s t u v w x y z", Attrs::new().family(Family::SansSerif), Shaping::Advanced);
buffer.shape_until_scroll(&mut font_system, false); buffer.shape_until_scroll(&mut font_system);
event_loop event_loop
.run(move |event, target| { .run(move |event, target| {