Detailed changes
@@ -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,
@@ -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<T>(
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,
@@ -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,