From 4ef47486819f32507ec7f14ebfe9480e38f855dc Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:20:46 -0600 Subject: [PATCH] Use buffer font for search (cherry-pick #10455) (#10494) Cherry-picked Use buffer font for search (#10455) It's wierd to type code/regex in the UI font Release Notes: - Continue to use buffer font for search Co-authored-by: Conrad Irwin --- crates/search/src/buffer_search.rs | 4 ++-- crates/search/src/project_search.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs index 5a1d4bafaa792ead4226cbb06cf200c4ba2a374d..34dcf602f6a4e13b3488476fb05584fa4812cd14 100644 --- a/crates/search/src/buffer_search.rs +++ b/crates/search/src/buffer_search.rs @@ -113,8 +113,8 @@ impl BufferSearchBar { } else { color }, - font_family: settings.ui_font.family.clone(), - font_features: settings.ui_font.features, + font_family: settings.buffer_font.family.clone(), + font_features: settings.buffer_font.features, font_size: rems(0.875).into(), font_weight: FontWeight::NORMAL, font_style: FontStyle::Normal, diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index c6a9a83ede60c20e60e373d87c11f88e699ca106..d457b139d86a5a0c7fdb6c230e6f2a9ccc8cab8a 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -1421,8 +1421,8 @@ impl ProjectSearchBar { } else { cx.theme().colors().text }, - font_family: settings.ui_font.family.clone(), - font_features: settings.ui_font.features, + font_family: settings.buffer_font.family.clone(), + font_features: settings.buffer_font.features, font_size: rems(0.875).into(), font_weight: FontWeight::NORMAL, font_style: FontStyle::Normal,