From a1ee2db6d1887ec962bb8c46b42e16c49fae5741 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 4 Oct 2023 08:48:05 +0200 Subject: [PATCH] Use Courier for now, to avoid panicking --- crates/gpui3/src/elements/text.rs | 6 +++--- crates/storybook2/src/collab_panel.rs | 2 +- crates/storybook2/src/workspace.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/gpui3/src/elements/text.rs b/crates/gpui3/src/elements/text.rs index b5f8fc5ec5..77390e79a4 100644 --- a/crates/gpui3/src/elements/text.rs +++ b/crates/gpui3/src/elements/text.rs @@ -46,11 +46,11 @@ impl Element for Text { .line_height .to_pixels(font_size.into(), cx.rem_size()); let text = self.text.clone(); - let paint_state = Arc::new(Mutex::new(None)); + let frame_state = Arc::new(Mutex::new(None)); let rem_size = cx.rem_size(); let layout_id = cx.request_measured_layout(Default::default(), rem_size, { - let frame_state = paint_state.clone(); + let frame_state = frame_state.clone(); move |_, _| { let Some(line_layout) = text_system .layout_line( @@ -77,7 +77,7 @@ impl Element for Text { } }); - Ok((layout_id?, paint_state)) + Ok((layout_id?, frame_state)) } fn paint<'a>( diff --git a/crates/storybook2/src/collab_panel.rs b/crates/storybook2/src/collab_panel.rs index 415598d0cb..0f4b2f4971 100644 --- a/crates/storybook2/src/collab_panel.rs +++ b/crates/storybook2/src/collab_panel.rs @@ -30,7 +30,7 @@ impl CollabPanel { .h_full() .flex() .flex_col() - .font("Zed Sans Extended") + .font("Courier") .text_color(theme.middle.base.default.foreground) .border_color(theme.middle.base.default.border) .border() diff --git a/crates/storybook2/src/workspace.rs b/crates/storybook2/src/workspace.rs index 15f26e52a5..9e0083379d 100644 --- a/crates/storybook2/src/workspace.rs +++ b/crates/storybook2/src/workspace.rs @@ -32,7 +32,7 @@ impl Workspace { .size_full() .flex() .flex_col() - .font("Zed Sans Extended") + .font("Courier") .gap_0() .justify_start() .items_start()