leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf: avoid duplicate Ustr for default font names

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-01-03 01:18:39 +01:00
parent 51ede4bce6
commit fdefc5860b
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/config/mod.rs
View file

@ -4,12 +4,12 @@
//! Configurations available to libcosmic applications. //! Configurations available to libcosmic applications.
use crate::cosmic_theme::Density; use crate::cosmic_theme::Density;
use crate::icon_theme::DEFAULT;
use cosmic_config::cosmic_config_derive::CosmicConfigEntry; use cosmic_config::cosmic_config_derive::CosmicConfigEntry;
use cosmic_config::{Config, CosmicConfigEntry}; use cosmic_config::{Config, CosmicConfigEntry};
use iced::font::Family;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::sync::{LazyLock, RwLock}; use std::sync::{LazyLock, RwLock};
use ustr::Ustr; use ustr::{existing_ustr, ustr, Ustr};
/// ID for the `CosmicTk` config. /// ID for the `CosmicTk` config.
pub const ID: &str = "com.system76.CosmicTk"; pub const ID: &str = "com.system76.CosmicTk";
@ -103,6 +103,9 @@ pub struct CosmicTk {
pub monospace_font: FontConfig, pub monospace_font: FontConfig,
} }
const DEFAULT_FONT_FAMILIES: LazyLock<[Ustr; 2]> =
LazyLock::new(|| [ustr("Fira Mono"), ustr("Fira Sans")]);
impl Default for CosmicTk { impl Default for CosmicTk {
fn default() -> Self { fn default() -> Self {
Self { Self {
@ -113,13 +116,13 @@ impl Default for CosmicTk {
header_size: Density::Standard, header_size: Density::Standard,
interface_density: Density::Standard, interface_density: Density::Standard,
interface_font: FontConfig { interface_font: FontConfig {
family: Ustr::from("Fira Sans"), family: DEFAULT_FONT_FAMILIES[1],
weight: iced::font::Weight::Normal, weight: iced::font::Weight::Normal,
stretch: iced::font::Stretch::Normal, stretch: iced::font::Stretch::Normal,
style: iced::font::Style::Normal, style: iced::font::Style::Normal,
}, },
monospace_font: FontConfig { monospace_font: FontConfig {
family: Ustr::from("Fira Mono"), family: DEFAULT_FONT_FAMILIES[0],
weight: iced::font::Weight::Normal, weight: iced::font::Weight::Normal,
stretch: iced::font::Stretch::Normal, stretch: iced::font::Stretch::Normal,
style: iced::font::Style::Normal, style: iced::font::Style::Normal,