From f4b8b0f4716d842580e9a4d9a6526c8c3f0553b0 Mon Sep 17 00:00:00 2001 From: Mayank Verma Date: Sat, 6 Dec 2025 03:54:59 +0530 Subject: [PATCH] settings: Fix inconsistent terminal font weight step size (#44243) Closes #44242 Release Notes: - Fixed inconsistent terminal font weight step size in settings --- crates/settings/src/settings_content/terminal.rs | 5 ++--- crates/terminal/src/terminal_settings.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/settings/src/settings_content/terminal.rs b/crates/settings/src/settings_content/terminal.rs index cd01eb14fa5ce19b077c39b67f8bd90ac93ad35f..1a30eecaa12e1e4a2a9799b2ec752bae2998a257 100644 --- a/crates/settings/src/settings_content/terminal.rs +++ b/crates/settings/src/settings_content/terminal.rs @@ -1,7 +1,7 @@ use std::path::PathBuf; use collections::HashMap; -use gpui::{AbsoluteLength, FontFeatures, SharedString, px}; +use gpui::{AbsoluteLength, FontFeatures, FontWeight, SharedString, px}; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use settings_macros::{MergeFrom, with_fallible_options}; @@ -96,8 +96,7 @@ pub struct TerminalSettingsContent { pub line_height: Option, pub font_features: Option, /// Sets the terminal's font weight in CSS weight units 0-900. - #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")] - pub font_weight: Option, + pub font_weight: Option, /// Default cursor shape for the terminal. /// Can be "bar", "block", "underline", or "hollow". /// diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs index 3b3070c6f680452b43d398786fa2a705a06d3404..3d70d85f35239778bee61113ebc51eea7d87adcb 100644 --- a/crates/terminal/src/terminal_settings.rs +++ b/crates/terminal/src/terminal_settings.rs @@ -95,7 +95,7 @@ impl settings::Settings for TerminalSettings { ) }), font_features: user_content.font_features, - font_weight: user_content.font_weight.map(FontWeight), + font_weight: user_content.font_weight, line_height: user_content.line_height.unwrap(), env: project_content.env.unwrap(), cursor_shape: user_content.cursor_shape.unwrap().into(),