From 065ab93ca77d4c41bdd6229acdcc846d11c3a562 Mon Sep 17 00:00:00 2001 From: Gilles Peiffer Date: Mon, 1 Jul 2024 15:45:01 +0200 Subject: [PATCH] Use user-defined font weight, where appropriate (#13653) Release Notes: - N/A --- crates/assistant/src/inline_assistant.rs | 8 ++++---- crates/language/src/outline.rs | 6 +++--- crates/search/src/buffer_search.rs | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/assistant/src/inline_assistant.rs b/crates/assistant/src/inline_assistant.rs index 855dba1d63..3c3a799126 100644 --- a/crates/assistant/src/inline_assistant.rs +++ b/crates/assistant/src/inline_assistant.rs @@ -18,9 +18,9 @@ use editor::{ use fs::Fs; use futures::{channel::mpsc, SinkExt, Stream, StreamExt}; use gpui::{ - point, AppContext, EventEmitter, FocusHandle, FocusableView, FontStyle, FontWeight, Global, - HighlightStyle, Model, ModelContext, Subscription, Task, TextStyle, UpdateGlobal, View, - ViewContext, WeakView, WhiteSpace, WindowContext, + point, AppContext, EventEmitter, FocusHandle, FocusableView, FontStyle, Global, HighlightStyle, + Model, ModelContext, Subscription, Task, TextStyle, UpdateGlobal, View, ViewContext, WeakView, + WhiteSpace, WindowContext, }; use language::{Buffer, Point, Selection, TransactionId}; use multi_buffer::MultiBufferRow; @@ -1730,7 +1730,7 @@ impl PromptEditor { font_family: settings.ui_font.family.clone(), font_features: settings.ui_font.features.clone(), font_size: rems(0.875).into(), - font_weight: FontWeight::NORMAL, + font_weight: settings.ui_font.weight, font_style: FontStyle::Normal, line_height: relative(1.3), background_color: None, diff --git a/crates/language/src/outline.rs b/crates/language/src/outline.rs index 7621280d7f..d4d7c8eee2 100644 --- a/crates/language/src/outline.rs +++ b/crates/language/src/outline.rs @@ -1,7 +1,7 @@ use fuzzy::{StringMatch, StringMatchCandidate}; use gpui::{ - relative, AppContext, BackgroundExecutor, FontStyle, FontWeight, HighlightStyle, StyledText, - TextStyle, WhiteSpace, + relative, AppContext, BackgroundExecutor, FontStyle, HighlightStyle, StyledText, TextStyle, + WhiteSpace, }; use settings::Settings; use std::ops::Range; @@ -159,7 +159,7 @@ pub fn render_item( font_family: settings.buffer_font.family.clone(), font_features: settings.buffer_font.features.clone(), font_size: settings.buffer_font_size(cx).into(), - font_weight: FontWeight::NORMAL, + font_weight: settings.buffer_font.weight, font_style: FontStyle::Normal, line_height: relative(1.), background_color: None, diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs index 216d5b9f6f..ad737990fa 100644 --- a/crates/search/src/buffer_search.rs +++ b/crates/search/src/buffer_search.rs @@ -14,9 +14,9 @@ use editor::{ use futures::channel::oneshot; use gpui::{ actions, div, impl_actions, Action, AppContext, ClickEvent, EventEmitter, FocusableView, - FontStyle, FontWeight, Hsla, InteractiveElement as _, IntoElement, KeyContext, - ParentElement as _, Render, ScrollHandle, Styled, Subscription, Task, TextStyle, View, - ViewContext, VisualContext as _, WhiteSpace, WindowContext, + FontStyle, Hsla, InteractiveElement as _, IntoElement, KeyContext, ParentElement as _, Render, + ScrollHandle, Styled, Subscription, Task, TextStyle, View, ViewContext, VisualContext as _, + WhiteSpace, WindowContext, }; use project::{ search::SearchQuery, @@ -116,7 +116,7 @@ impl BufferSearchBar { font_family: settings.buffer_font.family.clone(), font_features: settings.buffer_font.features.clone(), font_size: rems(0.875).into(), - font_weight: FontWeight::NORMAL, + font_weight: settings.buffer_font.weight, font_style: FontStyle::Normal, line_height: relative(1.3), background_color: None,