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

Merge branch 'element-types' of github.com:zed-industries/zed into element-types

Browse source
This commit is contained in:
Mikayla 2023-11-14 15:55:53 -08:00
commit b81b96f353
No known key found for this signature in database
2 changed files with 209 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/editor2/src/editor.rs
View file

@ -9413,14 +9413,17 @@ impl Render for Editor {
EditorMode::Full => cx.theme().colors().editor_background,
};
EditorElement::new(EditorStyle {
background,
local_player: cx.theme().players().local(),
text: text_style,
scrollbar_width: px(12.),
syntax: cx.theme().syntax().clone(),
diagnostic_style: cx.theme().diagnostic_style(),
})
EditorElement::new(
cx.view(),
EditorStyle {
background,
local_player: cx.theme().players().local(),
text: text_style,
scrollbar_width: px(12.),
syntax: cx.theme().syntax().clone(),
diagnostic_style: cx.theme().diagnostic_style(),
},
)
}
}