From 134c10b5430c716150554a25bc80e0a65444a45f Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Sat, 30 Dec 2023 14:51:20 -0800 Subject: [PATCH] Change default Text tool font to Cabin --- editor/src/consts.rs | 2 +- editor/src/messages/tool/tool_messages/text_tool.rs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/editor/src/consts.rs b/editor/src/consts.rs index 2825779b..40c1ebfd 100644 --- a/editor/src/consts.rs +++ b/editor/src/consts.rs @@ -77,7 +77,7 @@ pub const SCALE_EFFECT: f64 = 0.5; pub const COLOR_ACCENT: Color = Color::from_rgbf32_unchecked(0x00 as f32 / 255., 0xA8 as f32 / 255., 0xFF as f32 / 255.); // Fonts -pub const DEFAULT_FONT_FAMILY: &str = "Merriweather"; +pub const DEFAULT_FONT_FAMILY: &str = "Cabin"; pub const DEFAULT_FONT_STYLE: &str = "Normal (400)"; // Document diff --git a/editor/src/messages/tool/tool_messages/text_tool.rs b/editor/src/messages/tool/tool_messages/text_tool.rs index 64ca4508..16dcc644 100644 --- a/editor/src/messages/tool/tool_messages/text_tool.rs +++ b/editor/src/messages/tool/tool_messages/text_tool.rs @@ -2,6 +2,7 @@ use super::tool_prelude::*; use crate::application::generate_uuid; +use crate::consts::{DEFAULT_FONT_FAMILY, DEFAULT_FONT_STYLE}; use crate::messages::portfolio::document::overlays::utility_types::OverlayContext; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType}; @@ -32,8 +33,8 @@ impl Default for TextOptions { fn default() -> Self { Self { font_size: 24, - font_name: "Merriweather".into(), - font_style: "Normal (400)".into(), + font_name: DEFAULT_FONT_FAMILY.into(), + font_style: DEFAULT_FONT_STYLE.into(), fill: ToolColorOptions::new_primary(), } }