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

Raise minimum line height to 1.1

Browse source 
Disable buffer_line_height setting in non-buffer editors
This commit is contained in:
Mikayla Maki 2023-07-19 16:55:28 -07:00
parent 7e904183bf
commit aa67413abc
No known key found for this signature in database
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/editor/src/editor.rs
View file

@ -1300,7 +1300,7 @@ impl Editor {
let editor_view_id = cx.view_id();
let display_map = cx.add_model(|cx| {
let settings = settings::get::<ThemeSettings>(cx);
let style = build_style(settings, get_field_editor_theme.as_deref(), None, cx);
let style = build_style(settings, get_field_editor_theme.as_deref(), None, &mode, cx);
DisplayMap::new(
buffer.clone(),
style.text.font_id,
@ -1500,6 +1500,7 @@ impl Editor {
settings::get::<ThemeSettings>(cx),
self.get_field_editor_theme.as_deref(),
self.override_text_style.as_deref(),
&self.mode,
cx,
)
}
@ -8152,10 +8153,11 @@ fn build_style(
settings: &ThemeSettings,
get_field_editor_theme: Option<&GetFieldEditorTheme>,
override_text_style: Option<&OverrideTextStyle>,
mode: &EditorMode,
cx: &AppContext,
) -> EditorStyle {
let font_cache = cx.font_cache();
let line_height_scalar = settings.line_height();
let mut line_height_scalar = settings.line_height();
let theme_id = settings.theme.meta.id;
let mut theme = settings.theme.editor.clone();
let mut style = if let Some(get_field_editor_theme) = get_field_editor_theme {
@ -8166,6 +8168,14 @@ fn build_style(
.container
.background_color
.unwrap_or_default();
line_height_scalar = match mode {
EditorMode::Full => line_height_scalar,
EditorMode::AutoHeight { .. } | EditorMode::SingleLine => {
cx.font_cache().line_height(field_editor_theme.text.font_size)
}
};
EditorStyle {
text: field_editor_theme.text,
placeholder_text: field_editor_theme.placeholder_text,

1
crates/editor/src/element.rs
View file

@ -1977,6 +1977,7 @@ impl Element<Editor> for EditorElement {
let snapshot = editor.snapshot(cx);
let style = self.style.clone();
let line_height = (style.text.font_size * style.line_height_scalar).round();
let gutter_padding;