Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix UI font size changes not applying (#25307)

Browse source 
Related to #24857.

Release Notes:

- N/A
This commit is contained in:
João Marcos 2025-02-21 06:24:02 -03:00 • committed by GitHub
parent 4871d3c9e7
commit 5e1dd91ee5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/theme/src/settings.rs
View file

@ -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::<AdjustedUiFontSize>()
.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::<AdjustedUiFontSize>()
.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::<AdjustedUiFontSize>()
.map_or(ui_font_size, |adjusted_size| adjusted_size.0);

4
crates/theme/src/theme.rs
View file

@ -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::<SettingsStore>(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);