diff --git a/crates/assistant/src/inline_assistant.rs b/crates/assistant/src/inline_assistant.rs index cb4ada5f08..eb154ea020 100644 --- a/crates/assistant/src/inline_assistant.rs +++ b/crates/assistant/src/inline_assistant.rs @@ -2227,7 +2227,7 @@ impl PromptEditor { }, font_family: settings.buffer_font.family.clone(), font_fallbacks: settings.buffer_font.fallbacks.clone(), - font_size: settings.buffer_font_size.into(), + font_size: settings.buffer_font_size(cx).into(), font_weight: settings.buffer_font.weight, line_height: relative(settings.buffer_line_height.value()), ..Default::default() diff --git a/crates/assistant/src/terminal_inline_assistant.rs b/crates/assistant/src/terminal_inline_assistant.rs index f0a7a2d553..e8b049371b 100644 --- a/crates/assistant/src/terminal_inline_assistant.rs +++ b/crates/assistant/src/terminal_inline_assistant.rs @@ -1049,7 +1049,7 @@ impl PromptEditor { }, font_family: settings.buffer_font.family.clone(), font_fallbacks: settings.buffer_font.fallbacks.clone(), - font_size: settings.buffer_font_size.into(), + font_size: settings.buffer_font_size(cx).into(), font_weight: settings.buffer_font.weight, line_height: relative(settings.buffer_line_height.value()), ..Default::default() diff --git a/crates/assistant2/src/inline_prompt_editor.rs b/crates/assistant2/src/inline_prompt_editor.rs index c1764cf30d..3323246903 100644 --- a/crates/assistant2/src/inline_prompt_editor.rs +++ b/crates/assistant2/src/inline_prompt_editor.rs @@ -56,7 +56,7 @@ impl EventEmitter for PromptEditor {} impl Render for PromptEditor { fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { - let ui_font_size = ThemeSettings::get_global(cx).ui_font_size; + let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx); let mut buttons = Vec::new(); let left_gutter_width = match &self.mode { diff --git a/crates/editor/src/commit_tooltip.rs b/crates/editor/src/commit_tooltip.rs index 4bcb73f8ca..b9a3a444f7 100644 --- a/crates/editor/src/commit_tooltip.rs +++ b/crates/editor/src/commit_tooltip.rs @@ -210,7 +210,7 @@ impl Render for CommitTooltip { .as_ref() .and_then(|details| details.pull_request.clone()); - let ui_font_size = ThemeSettings::get_global(cx).ui_font_size; + let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx); let message_max_height = window.line_height() * 12 + (ui_font_size / 0.4); tooltip_container(window, cx, move |this, _, cx| { diff --git a/crates/editor/src/editor_settings_controls.rs b/crates/editor/src/editor_settings_controls.rs index 6275ec97a1..9e22c64393 100644 --- a/crates/editor/src/editor_settings_controls.rs +++ b/crates/editor/src/editor_settings_controls.rs @@ -125,8 +125,7 @@ impl EditableSettingControl for BufferFontSizeControl { } fn read(cx: &App) -> Self::Value { - let settings = ThemeSettings::get_global(cx); - settings.buffer_font_size + ThemeSettings::get_global(cx).buffer_font_size(cx) } fn apply( diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs index e4d7676a7f..a343dbf323 100644 --- a/crates/editor/src/hover_popover.rs +++ b/crates/editor/src/hover_popover.rs @@ -339,7 +339,7 @@ fn show_hover( base_text_style.refine(&TextStyleRefinement { font_family: Some(settings.ui_font.family.clone()), font_fallbacks: settings.ui_font.fallbacks.clone(), - font_size: Some(settings.ui_font_size.into()), + font_size: Some(settings.ui_font_size(cx).into()), color: Some(cx.theme().colors().editor_foreground), background_color: Some(gpui::transparent_black()), diff --git a/crates/editor/src/signature_help.rs b/crates/editor/src/signature_help.rs index c75e45c1e4..dbad782766 100644 --- a/crates/editor/src/signature_help.rs +++ b/crates/editor/src/signature_help.rs @@ -206,7 +206,7 @@ impl Editor { color: cx.theme().colors().text, font_family: settings.buffer_font.family.clone(), font_fallbacks: settings.buffer_font.fallbacks.clone(), - font_size: settings.buffer_font_size.into(), + font_size: settings.buffer_font_size(cx).into(), font_weight: settings.buffer_font.weight, line_height: relative(settings.buffer_line_height.value()), ..Default::default() diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs index e61b8faa4a..6cc67e1149 100644 --- a/crates/git_ui/src/commit_modal.rs +++ b/crates/git_ui/src/commit_modal.rs @@ -141,7 +141,7 @@ impl CommitModal { let settings = ThemeSettings::get_global(cx); let line_height = relative(settings.buffer_line_height.value()) - .to_pixels(settings.buffer_font_size.into(), window.rem_size()); + .to_pixels(settings.buffer_font_size(cx).into(), window.rem_size()); v_flex() .justify_between() diff --git a/crates/recent_projects/src/ssh_connections.rs b/crates/recent_projects/src/ssh_connections.rs index ea733c2137..f30dc190e1 100644 --- a/crates/recent_projects/src/ssh_connections.rs +++ b/crates/recent_projects/src/ssh_connections.rs @@ -186,7 +186,7 @@ impl SshPrompt { let refinement = TextStyleRefinement { font_family: Some(theme.buffer_font.family.clone()), font_features: Some(FontFeatures::disable_ligatures()), - font_size: Some(theme.buffer_font_size.into()), + font_size: Some(theme.buffer_font_size(cx).into()), color: Some(cx.theme().colors().editor_foreground), background_color: Some(gpui::transparent_black()), ..Default::default() diff --git a/crates/repl/src/notebook/cell.rs b/crates/repl/src/notebook/cell.rs index 7658a106e0..d4df0f60f8 100644 --- a/crates/repl/src/notebook/cell.rs +++ b/crates/repl/src/notebook/cell.rs @@ -186,7 +186,7 @@ impl Cell { let refinement = TextStyleRefinement { font_family: Some(theme.buffer_font.family.clone()), - font_size: Some(theme.buffer_font_size.into()), + font_size: Some(theme.buffer_font_size(cx).into()), color: Some(cx.theme().colors().editor_foreground), background_color: Some(gpui::transparent_black()), ..Default::default() diff --git a/crates/repl/src/outputs/table.rs b/crates/repl/src/outputs/table.rs index 8d91682342..04eb2cc6e7 100644 --- a/crates/repl/src/outputs/table.rs +++ b/crates/repl/src/outputs/table.rs @@ -94,7 +94,7 @@ impl TableView { let text_system = window.text_system(); let text_style = window.text_style(); let text_font = ThemeSettings::get_global(cx).buffer_font.clone(); - let font_size = ThemeSettings::get_global(cx).buffer_font_size; + let font_size = ThemeSettings::get_global(cx).buffer_font_size(cx); let mut runs = [TextRun { len: 0, font: text_font, diff --git a/crates/settings_ui/src/appearance_settings_controls.rs b/crates/settings_ui/src/appearance_settings_controls.rs index fb373667c1..d1cae1d8a7 100644 --- a/crates/settings_ui/src/appearance_settings_controls.rs +++ b/crates/settings_ui/src/appearance_settings_controls.rs @@ -239,8 +239,7 @@ impl EditableSettingControl for UiFontSizeControl { } fn read(cx: &App) -> Self::Value { - let settings = ThemeSettings::get_global(cx); - settings.ui_font_size + ThemeSettings::get_global(cx).ui_font_size(cx) } fn apply( diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs index 3735927115..9b6c6a0c82 100644 --- a/crates/theme/src/settings.rs +++ b/crates/theme/src/settings.rs @@ -95,13 +95,17 @@ pub struct ThemeSettings { /// as well as the size of a [gpui::Rems] unit. /// /// Changing this will impact the size of all UI elements. - pub ui_font_size: Pixels, + /// + /// Use [ThemeSettings::ui_font_size] to access this. + ui_font_size: Pixels, /// The font used for UI elements. pub ui_font: Font, /// The font size used for buffers, and the terminal. /// /// The terminal font size can be overridden using it's own setting. - pub buffer_font_size: Pixels, + /// + /// Use [ThemeSettings::buffer_font_size] to access this. + buffer_font_size: Pixels, /// The font used for buffers, and the terminal. /// /// The terminal font family can be overridden using it's own setting. @@ -569,6 +573,14 @@ impl ThemeSettings { clamp_font_size(font_size) } + /// Returns the UI font size. + pub fn ui_font_size(&self, cx: &App) -> Pixels { + let font_size = cx + .try_global::() + .map_or(self.ui_font_size, |size| size.0); + clamp_font_size(font_size) + } + // TODO: Rename: `line_height` -> `buffer_line_height` /// Returns the buffer's line height. pub fn line_height(&self) -> f32 { @@ -715,14 +727,14 @@ pub fn setup_ui_font(window: &mut Window, cx: &mut App) -> gpui::Font { /// Gets the adjusted UI font size. pub fn get_ui_font_size(cx: &App) -> Pixels { - let ui_font_size = ThemeSettings::get_global(cx).ui_font_size; + let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx); cx.try_global::() .map_or(ui_font_size, |adjusted_size| adjusted_size.0) } /// Sets the adjusted UI font size. pub fn adjust_ui_font_size(cx: &mut App, mut f: impl FnMut(&mut Pixels)) { - let ui_font_size = ThemeSettings::get_global(cx).ui_font_size; + let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx); let mut adjusted_size = cx .try_global::() .map_or(ui_font_size, |adjusted_size| adjusted_size.0); diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index e62910b681..bebf6f8aa7 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -103,9 +103,9 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut App) { ThemeSettings::register(cx); FontFamilyCache::init_global(cx); - let mut prev_buffer_font_size = ThemeSettings::get_global(cx).buffer_font_size; + let mut prev_buffer_font_size = ThemeSettings::get_global(cx).buffer_font_size(cx); cx.observe_global::(move |cx| { - let buffer_font_size = ThemeSettings::get_global(cx).buffer_font_size; + let buffer_font_size = ThemeSettings::get_global(cx).buffer_font_size(cx); if buffer_font_size != prev_buffer_font_size { prev_buffer_font_size = buffer_font_size; reset_buffer_font_size(cx); diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs index 03e5fa407d..4bd69f506c 100644 --- a/crates/ui/src/components/context_menu.rs +++ b/crates/ui/src/components/context_menu.rs @@ -507,7 +507,7 @@ impl ContextMenuItem { impl Render for ContextMenu { fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { - let ui_font_size = ThemeSettings::get_global(cx).ui_font_size; + let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx); let aside = self .documentation_aside diff --git a/crates/ui/src/styles/typography.rs b/crates/ui/src/styles/typography.rs index c575e73475..d0f05b6cb2 100644 --- a/crates/ui/src/styles/typography.rs +++ b/crates/ui/src/styles/typography.rs @@ -140,8 +140,8 @@ impl TextSize { Self::Default => rems_from_px(14.), Self::Small => rems_from_px(12.), Self::XSmall => rems_from_px(10.), - Self::Ui => rems_from_px(theme_settings.ui_font_size.into()), - Self::Editor => rems_from_px(theme_settings.buffer_font_size.into()), + Self::Ui => rems_from_px(theme_settings.ui_font_size(cx).into()), + Self::Editor => rems_from_px(theme_settings.buffer_font_size(cx).into()), } } } diff --git a/crates/ui_macros/src/dynamic_spacing.rs b/crates/ui_macros/src/dynamic_spacing.rs index d2d6d5d23b..a8890aca6b 100644 --- a/crates/ui_macros/src/dynamic_spacing.rs +++ b/crates/ui_macros/src/dynamic_spacing.rs @@ -157,7 +157,7 @@ pub fn derive_spacing(input: TokenStream) -> TokenStream { /// Returns the spacing value in pixels. pub fn px(&self, cx: &App) -> Pixels { - let ui_font_size_f32: f32 = ThemeSettings::get_global(cx).ui_font_size.into(); + let ui_font_size_f32: f32 = ThemeSettings::get_global(cx).ui_font_size(cx).into(); px(ui_font_size_f32 * self.spacing_ratio(cx)) } } diff --git a/crates/zed/src/zed/linux_prompts.rs b/crates/zed/src/zed/linux_prompts.rs index 09d1eabf84..e6c2bf62b1 100644 --- a/crates/zed/src/zed/linux_prompts.rs +++ b/crates/zed/src/zed/linux_prompts.rs @@ -39,7 +39,7 @@ pub fn fallback_prompt_renderer( let mut base_text_style = window.text_style(); base_text_style.refine(&TextStyleRefinement { font_family: Some(settings.ui_font.family.clone()), - font_size: Some(settings.ui_font_size.into()), + font_size: Some(settings.ui_font_size(cx).into()), color: Some(ui::Color::Muted.color(cx)), ..Default::default() });