Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Courier for now, to avoid panicking

Browse source
This commit is contained in:
Antonio Scandurra 2023-10-04 08:48:05 +02:00
parent 25a2554bdd
commit a1ee2db6d1
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/gpui3/src/elements/text.rs
View file

@ -46,11 +46,11 @@ impl<S: 'static> Element for Text<S> {
.line_height .line_height
.to_pixels(font_size.into(), cx.rem_size()); .to_pixels(font_size.into(), cx.rem_size());
let text = self.text.clone(); 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 rem_size = cx.rem_size();
let layout_id = cx.request_measured_layout(Default::default(), 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 |_, _| { move |_, _| {
let Some(line_layout) = text_system let Some(line_layout) = text_system
.layout_line( .layout_line(
@ -77,7 +77,7 @@ impl<S: 'static> Element for Text<S> {
} }
}); });
Ok((layout_id?, paint_state)) Ok((layout_id?, frame_state))
} }
fn paint<'a>( fn paint<'a>(

2
crates/storybook2/src/collab_panel.rs
View file

@ -30,7 +30,7 @@ impl CollabPanel {
.h_full() .h_full()
.flex() .flex()
.flex_col() .flex_col()
.font("Zed Sans Extended") .font("Courier")
.text_color(theme.middle.base.default.foreground) .text_color(theme.middle.base.default.foreground)
.border_color(theme.middle.base.default.border) .border_color(theme.middle.base.default.border)
.border() .border()

2
crates/storybook2/src/workspace.rs
View file

@ -32,7 +32,7 @@ impl Workspace {
.size_full() .size_full()
.flex() .flex()
.flex_col() .flex_col()
.font("Zed Sans Extended") .font("Courier")
.gap_0() .gap_0()
.justify_start() .justify_start()
.items_start() .items_start()